diff --git a/public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html b/public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html
index be1fbada..53495188 100755
--- a/public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html
+++ b/public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html
@@ -64,7 +64,6 @@ ng-style="{'color':button.color}">
 
 
 <div class="row form-actions" id="submit_field"
-<<<<<<< f4590ec7d744fde5b543eba3d589cd5727222143
 	ng-class="{activeField: selected._id == 'submit_field' }"
 	ng-style="{ 'background-color':myform.design.colors.buttonColor}"
 	style="border-top: 1px solid #ddd; margin-right: -13%; margin-left: -13%; margin-top: 30vh; height: 100vh">