diff --git a/pyMBE.py b/pyMBE.py
index 9983616..bb76226 100644
--- a/pyMBE.py
+++ b/pyMBE.py
@@ -2855,12 +2855,3 @@ def write_output_vtf_file(self, espresso_system, filename):
             for particle in espresso_system.part:
                 coordinates.write (f'{particle.id} \t {particle.pos[0]} \t {particle.pos[1]} \t {particle.pos[2]}\n')
         return 
-<<<<<<< HEAD
-<<<<<<< HEAD
-    
-=======
-
-
->>>>>>> main
-=======
->>>>>>> 01aff9d397de1e65a9eb86fabe8e4ce3776c2b00