diff --git a/src/VCluster_semantic_unit_tests.hpp b/src/VCluster_semantic_unit_tests.hpp
index 87fc8309f1e7c28f8b36b2f8236509f7124dcf43..e85546f569436c8a6f15a29f4e0078df1664625e 100644
--- a/src/VCluster_semantic_unit_tests.hpp
+++ b/src/VCluster_semantic_unit_tests.hpp
@@ -1374,5 +1374,4 @@ BOOST_AUTO_TEST_CASE (Vcluster_semantic_sendrecv_6)
 
 BOOST_AUTO_TEST_SUITE_END()
 
-#endif /* OPENFPM_VCLUSTER_SRC_VCLUSTER_SEMANTIC_UNIT_TESTS_HPP_ */
->>>>>>> origin/gather_with_packer
+#endif /* OPENFPM_VCLUSTER_SRC_VCLUSTER_SEMANTIC_UNIT_TESTS_HPP_ */