diff --git a/modules/libpref/goanna.js b/modules/libpref/goanna.js
index 06fd94ed71..d59110b6a6 100644
--- a/modules/libpref/goanna.js
+++ b/modules/libpref/goanna.js
@@ -1,7 +1,5 @@
 #include ../../netwerk/base/security-prefs.js
 #include init/all.js
-<<<<<<< HEAD
-=======
 #ifdef MOZ_DATA_REPORTING
 #include ../../toolkit/components/telemetry/datareporting-prefs.js
 #endif
@@ -12,4 +10,3 @@
 #include ../../toolkit/components/telemetry/healthreport-prefs.js
 #endif
 #endif
->>>>>>> parent of b21588597c (Issue #1053 - Part 1c: Remove references to mobile/android targets and paths)