diff --git a/constants.properties b/constants.properties
index 2bb445e881..9e3bdc0ec6 100644
--- a/constants.properties
+++ b/constants.properties
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #
 # R3 Proprietary and Confidential
 #