diff --git a/features/options/prepare/files.feature b/features/options/prepare/files.feature
index fb078d0f1..de356a82b 100644
--- a/features/options/prepare/files.feature
+++ b/features/options/prepare/files.feature
@@ -17,11 +17,7 @@ Feature: osrm-prepare command line options: files
         When I run "osrm-prepare {base}.osrm --profile {profile}"
         Then stderr should be empty
         And it should exit with code 0
-<<<<<<< Updated upstream
-    
-=======
 
->>>>>>> Stashed changes
     Scenario: osrm-prepare - Order of options should not matter
         When I run "osrm-prepare --profile {profile} {base}.osrm"
         Then stderr should be empty