diff --git a/tests.toml b/tests.toml
index 7148d35..cbdecd9 100644
--- a/tests.toml
+++ b/tests.toml
@@ -1,8 +1,5 @@
 test_format = 1.0
 
-<<<<<<< Updated upstream
-[default]
-=======
 [default]
 
     # -------------------------------
@@ -10,4 +7,3 @@ test_format = 1.0
     # -------------------------------
 
     args.admin="xana"
->>>>>>> Stashed changes