diff --git a/tests/expected/option_version.out b/tests/expected/option_version.out
index 55d7c7f0..560b6b59 100644
--- a/tests/expected/option_version.out
+++ b/tests/expected/option_version.out
@@ -1,5 +1 @@
-<<<<<<< HEAD
 pg_probackup 2.5.0
-=======
-pg_probackup 2.4.8
->>>>>>> master