diff --git a/resources-en/src/messages/JavaErrorMessages.properties b/resources-en/src/messages/JavaErrorMessages.properties
index 0d72c9964ca0..1c905d8329e1 100644
--- a/resources-en/src/messages/JavaErrorMessages.properties
+++ b/resources-en/src/messages/JavaErrorMessages.properties
@@ -334,7 +334,3 @@ illegal.initializer=Illegal initializer for ''{0}''
 class.cannot.inherit.from.its.type.parameter=Class cannot inherit from its type parameter
 cannot.resolve.package=Cannot resolve package {0}
 override.not.allowed.in.interfaces=@Override is not allowed when implementing interface method
-<<<<<<< HEAD
-
-=======
->>>>>>> idea90