diff --git a/Tools/autotest/locations.txt b/Tools/autotest/locations.txt
index 5d6c453347e8e..d26aaf2bd7cc1 100644
--- a/Tools/autotest/locations.txt
+++ b/Tools/autotest/locations.txt
@@ -97,9 +97,6 @@ RF_Castle=37.090662,-3.074557,2736,0
 RF_Garage=37.621798,-2.646596,788,0
 SFO_Bay=37.62561973,-122.33235387,0.0,0
 Egge=60.215720,10.324071,198,303
-<<<<<<< HEAD
 Fulcrum=41.841650,-71.371763,0,290
 Hueneme=34.154695,-119.227468,0,270
-=======
-Gundaroo=-35.02349196,149.26496411,576.8,0
->>>>>>> e59d43228150f8f0458cbb8b5c94f163ac646343
+Gundaroo=-35.02349196,149.26496411,576.8,0
\ No newline at end of file