MC-2358: Update column configuration form

- Fix merge conflict

Author: raith-hamzah

app/code/Magento/PageBuilder/view/base/pagebuilder/content_type/column.xml

@@ -202,11 +202,6 @@
                                     <property name="justify_content" source="justify_content" persist="false"/>
                                     <property name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
                                     <property name="width" source="width"/>
-<<<<<<< HEAD
-                                    <complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/margins"/>
-                                    <complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/paddings"/>
-=======
->>>>>>> cms-team-1-delivery
                                     <static_property source="align_self" value="flex-end"/>
                                     <complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/margins-and-paddings" converter="Magento_PageBuilder/js/converter/style/margins-and-paddings"/>
                                 </style_properties>