diff --git a/AUTHORS b/AUTHORS
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
 For a full list of the people who are credited with making a
 contribution to Mozilla, see https://www.mozilla.org/credits/ .
 
-MERGE CONFLICT
+MERGE CONFLICT testing