Remove duplicate code from manual conflict resolution
Remove duplicate code from manual conflict resolution

dotmailer/dotmailer-magento2-extension,dotmailer/dotmailer-magento2-extension,dotmailer/dotmailer-magento2-extension