MC-518: Simplify mapping of content type

- Fixed merge conflict issues

Author: Michael Yu

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

@@ -71,7 +71,7 @@
                                     <property name="background_attachment" source="background_attachment"/>
                                     <property name="margins_and_padding" source="padding" virtual="true" converter="Magento_PageBuilder/js/converter/style/paddings"/>
                                 </style_properties>
-                                                            </element>
+                            </element>
                             <element name="mobile_image">
                                 <style_properties>
                                     <property name="text_align" source="text_align"/>

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

@@ -358,9 +358,6 @@
                                     <property name="background_attachment" source="background_attachment"/>
                                     <complex_property name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
                                     <complex_property name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
-                                  </style_properties>
-                                    <complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
-                                    <complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
                                 </style_properties>
                             </element>
                             <element name="mobile_image">