resolved merge conflict

Author: solwininfotech

app/code/Magento/Customer/etc/adminhtml/system.xml

@@ -86,6 +86,9 @@
                     <comment>To show VAT number on Storefront, set Show VAT Number on Storefront option to Yes.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="email_domain" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Default Email Domain</label>
+                </field>
                 <field id="email_template" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Default Welcome Email</label>
                     <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>

app/code/Magento/Customer/etc/config.xml

@@ -23,6 +23,7 @@
                 <email_confirmed_template>customer_create_account_email_confirmed_template</email_confirmed_template>
                 <viv_disable_auto_group_assign_default>0</viv_disable_auto_group_assign_default>
                 <vat_frontend_visibility>0</vat_frontend_visibility>
+                <email_domain>example.com</email_domain>
                 <generate_human_friendly_id>0</generate_human_friendly_id>
             </create_account>
             <default>