diff --git a/platform/features/fixed/bundle.js b/platform/features/fixed/bundle.js
index a158f51083..64f08d97ca 100644
--- a/platform/features/fixed/bundle.js
+++ b/platform/features/fixed/bundle.js
@@ -152,100 +152,66 @@ define([
                                         "text": "X",
                                         "name": "X",
                                         "cssClass": "l-input-sm",
-<<<<<<< HEAD
                                         "control": "numberfield",
                                         "min": "0"
-=======
-                                        "control": "textfield"
->>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
                                     },
                                     {
                                         "property": "editY",
                                         "text": "Y",
                                         "name": "Y",
                                         "cssClass": "l-input-sm",
-<<<<<<< HEAD
                                         "control": "numberfield",
                                         "min": "0"
-=======
-                                        "control": "textfield"
->>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
                                     },
                                     {
                                         "property": "editX1",
                                         "text": "X1",
                                         "name": "X1",
                                         "cssClass": "l-input-sm",
-<<<<<<< HEAD
                                         "control" : "numberfield",
                                         "min": "0"
-=======
-                                        "control" : "textfield"
->>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
                                     },
                                     {
                                         "property": "editY1",
                                         "text": "Y1",
                                         "name": "Y1",
                                         "cssClass": "l-input-sm",
-<<<<<<< HEAD
                                         "control" : "numberfield",
                                         "min": 0
-=======
-                                        "control" : "textfield"
->>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
                                     },
                                     {
                                         "property": "editX2",
                                         "text": "X2",
                                         "name": "X2",
                                         "cssClass": "l-input-sm",
-<<<<<<< HEAD
                                         "control" : "numberfield",
                                         "min": "0"
-=======
-                                        "control" : "textfield"
->>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
                                     },
                                     {
                                         "property": "editY2",
                                         "text": "Y2",
                                         "name": "Y2",
                                         "cssClass": "l-input-sm",
-<<<<<<< HEAD
                                         "control" : "numberfield",
                                         "min": "0"
-=======
-                                        "control" : "textfield"
->>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
                                     },
                                     {
                                         "property": "editHeight",
                                         "text": "H",
                                         "name": "H",
-<<<<<<< HEAD
                                         "cssClass": "l-input-sm",
                                         "control": "numberfield",
-                                        "description": "Resize change object height",
+                                        "description": "Resize object height",
                                         "min": "1"
-=======
-                                        "cssClass": "l-input-sm numerical",
-                                        "control": "textfield",
-                                        "description": "Resize change object height"
->>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
                                     },
                                     {
                                         "property": "editWidth",
                                         "text": "W",
                                         "name": "W",
-<<<<<<< HEAD
                                         "cssClass": "l-input-sm",
                                         "control": "numberfield",
+                                        "description": "Resize object width",
                                         "min": "1"
-=======
-                                        "cssClass": "l-input-sm numerical",
-                                        "control": "textfield"
->>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
                                     }
                                 ]
                             },
diff --git a/platform/features/layout/src/elements/BoxProxy.js b/platform/features/layout/src/elements/BoxProxy.js
index c63db68d39..6d80d8c1f9 100644
--- a/platform/features/layout/src/elements/BoxProxy.js
+++ b/platform/features/layout/src/elements/BoxProxy.js
@@ -53,17 +53,10 @@ define(
             proxy.fill = new AccessorMutator(element, 'fill');
 
             //Expose x,y, width and height for editing
-<<<<<<< HEAD
             proxy.editWidth = new AccessorMutator(element, 'width');
             proxy.editHeight = new AccessorMutator(element, 'height');
             proxy.editX = new AccessorMutator(element, 'x');
             proxy.editY = new AccessorMutator(element, 'y');
-=======
-            proxy.editWidth = new AccessorMutator(element, 'width', proxy.checkNumeric);
-            proxy.editHeight = new AccessorMutator(element, 'height', proxy.checkNumeric);
-            proxy.editX = new AccessorMutator(element, 'x', proxy.checkNumeric);
-            proxy.editY = new AccessorMutator(element, 'y',  proxy.checkNumeric);
->>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
 
             return proxy;
         }
diff --git a/platform/features/layout/src/elements/ImageProxy.js b/platform/features/layout/src/elements/ImageProxy.js
index 06827fbdcb..1ff5b83ee1 100644
--- a/platform/features/layout/src/elements/ImageProxy.js
+++ b/platform/features/layout/src/elements/ImageProxy.js
@@ -49,18 +49,11 @@ define(
              */
             proxy.url = new AccessorMutator(element, 'url');
 
-            //Expose width and height properties for editing
-<<<<<<< HEAD
+            //Expose x,y, width and height properties for editing
             proxy.editWidth = new AccessorMutator(element, 'width');
             proxy.editHeight = new AccessorMutator(element, 'height');
             proxy.editX = new AccessorMutator(element, 'x');
             proxy.editY = new AccessorMutator(element, 'y');
-=======
-            proxy.editWidth = new AccessorMutator(element, 'width', proxy.checkNumeric);
-            proxy.editHeight = new AccessorMutator(element, 'height', proxy.checkNumeric);
-            proxy.editX = new AccessorMutator(element, 'x', proxy.checkNumeric);
-            proxy.editY = new AccessorMutator(element, 'y', proxy.checkNumeric);
->>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
 
             return proxy;
         }
diff --git a/platform/features/layout/src/elements/LineProxy.js b/platform/features/layout/src/elements/LineProxy.js
index 431296ad8b..e5ec31c149 100644
--- a/platform/features/layout/src/elements/LineProxy.js
+++ b/platform/features/layout/src/elements/LineProxy.js
@@ -149,17 +149,11 @@ define(
             };
 
             // Expose endpoint coordinates for editing
-<<<<<<< HEAD
             proxy.editX1 = new AccessorMutator(element, 'x');
             proxy.editY1 = new AccessorMutator(element, 'y');
             proxy.editX2 = new AccessorMutator(element, 'x2');
             proxy.editY2 = new AccessorMutator(element, 'y2');
-=======
-            proxy.editX1 = new AccessorMutator(element, 'x', proxy.checkNumeric);
-            proxy.editY1 = new AccessorMutator(element, 'y', proxy.checkNumeric);
-            proxy.editX2 = new AccessorMutator(element, 'x2', proxy.checkNumeric);
-            proxy.editY2 = new AccessorMutator(element, 'y2', proxy.checkNumeric);
->>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
+
 
             return proxy;
         }