diff --git a/Control/CalypsoExample/GeoModelTest/README.md b/Control/CalypsoExample/GeoModelTest/README.md
index 832c17a72d248ef865dd1c0e772297a8af680e97..a3d861b61da84c66913a6d3d5197233c9a4c5076 100644
--- a/Control/CalypsoExample/GeoModelTest/README.md
+++ b/Control/CalypsoExample/GeoModelTest/README.md
@@ -1,22 +1,3 @@
-<<<<<<< HEAD
-This example package actually serves several purposes:
-
-*) It illustrates how to initialize and access the detector description and magnetic field.
-*) It checks that the expected number of detector elements are created.
-*) It generates a set of neutral alignment constants for the Tracker, which can be folded into the conditions database.
-*) It dumps a standalone GeoModel sqlite geometry database which could be used by external programs to display FASER without requiring any FASER software (only GeoModel)
-
-To run the algorithm, in a run directory where Calypso has been installed, do
-
-run > ./setup.sh
-run > python python/GeoModelTest/GeoModelTestConfig.py
-
-The file GeoModelTestConfig.py can be edited to change some run options.
-
-After running the algorithm, to add the alignment data into your local conditions DB, do:
-
-run > CopyAlignFolder.sh
-=======
 This example package serves several purposes:
 
 
@@ -42,6 +23,6 @@ After running the algorithm, to add the alignment data into your local condition
 ```
 run > CopyAlignFolder.sh
 ```
->>>>>>> 101c2c7308dc4189ca54fa71c97222e7670a54a7
+