diff --git a/pl/qly.yap b/pl/qly.yap
index fa968c51d..31b669095 100755
--- a/pl/qly.yap
+++ b/pl/qly.yap
@@ -240,11 +240,7 @@ qend_program :-
 	X \= argv,
 	X \= os_argv,
 	X \= language,
-<<<<<<< HEAD
-    X \= encoding,
-=======
 	X \= encoding,
->>>>>>> e02884a94f37871fd2d44cfedd3e9ef9f28f0464
 	fail.
 
 qsave_file(F0) :-