Fix Conflicts Outlook For Mac