diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html
index 815b3023d..8c899c42c 100644
--- a/workflow/engine/templates/designer/index.html
+++ b/workflow/engine/templates/designer/index.html
@@ -30,11 +30,8 @@
         var SYS_LANG = "{$SYS_LANG}";
         var SYS_SKIN = "{$SYS_SKIN}";
         var HTTP_SERVER_HOSTNAME = "{$HTTP_SERVER_HOSTNAME}";
-<<<<<<< HEAD
         var PMDYNAFORM_FIRST_TIME = "{$PMDYNAFORM_FIRST_TIME}" === "1";
-=======
         var maxFileSizeInformation = {$maxFileSizeInformation};
->>>>>>> origin/develop
     </script>
     <script type="text/javascript" src="/lib-dev/js/wz_jsgraphics.js"></script>
     <script type="text/javascript" src="/lib-dev/js/jquery-1.10.2.min.js"></script>