diff --git a/src/cbaselib.c b/src/cbaselib.c
index 3e3e076..d653fc3 100644
--- a/src/cbaselib.c
+++ b/src/cbaselib.c
@@ -878,9 +878,14 @@ int cosmoB_vnewindexBProto(CState *state, int nargs, CValue *args)
 // vm.collect()
 int cosmoB_vcollect(CState *state, int nargs, CValue *args)
 {
+<<<<<<< HEAD
     // now force a garbage collection
     cosmoM_collectGarbage(state);
 
+=======
+    // force a garbage collection
+    cosmoM_collectGarbage(state);
+>>>>>>> 409937c (fix vm.collect())
     return 0;
 }