diff --git a/desktop/toolkit/qt5/qt5-webengine/actions.py b/desktop/toolkit/qt5/qt5-webengine/actions.py
index b582c1fe31..0b402993b6 100644
--- a/desktop/toolkit/qt5/qt5-webengine/actions.py
+++ b/desktop/toolkit/qt5/qt5-webengine/actions.py
@@ -14,12 +14,7 @@ def setup():
     shelltools.export("QT5LINK", "/usr/lib/qt5/bin")
     shelltools.export("QT5DIR", "/usr/lib/qt5")
     shelltools.export("CFLAGS", "%s -I/usr/lib/sqlite3.11.0.0" % get.CFLAGS())
-<<<<<<< HEAD
     shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs qtwebengine.pro")
-=======
-    qt5.configure(parameters="WEBENGINE_CONFIG+=use_proprietary_codecs")
-    #shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs qtwebengine.pro")
->>>>>>> e48ac11fa2d0a58e97e44fadb628cef95f99f432
     
 def build():
     qt5.make()