resolve conflicts

Author: Hani Yacoub

l10n_CM/region/Unified.json

@@ -14,9 +14,12 @@
         "test_demo_cc_dropdown-presence.py",
         "test_demo_cc_yellow_highlight.py",
         "test_demo_ad_yellow_highlight.py",
+        "test_demo_ad_yellow_highlight_phone_email.py",
+        "test_demo_ad_yellow_highlight.py",
         "test_demo_ad_autofill_address_fields.py",
         "test_demo_ad_yellow_highlight_name_org.py",
         "test_demo_ad_yellow_highlight_address.py",
+        "test_demo_ad_clear_name_org.py",
         "test_demo_ad_yellow_highlight_phone_email.py",
         "test_demo_ad_clear_name_org.py"
   ]