diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 690f4b8ea..a9fb2e9d7 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1264,10 +1264,7 @@ ip_range_in_c=Start IP and end IP in a IP range must with in C subnet
 ip_range_bit_field=Start IP and end IP in a IP range has the same network number bit field
 ip_range_smaller=Start IP in a IP range should smaller than end IP
 alternative_values= Alternative values can be %s
-<<<<<<< HEAD
 certificate_error=Wrong format of public key file and private key file
 public_file_error=Wrong format of public key file
 private_file_error=Wrong format of private key file
-=======
->>>>>>> branch 'develop' of http://192.168.10.125/k18_web/NFS.git
 keyframe_pic_required=No keyframe pictures have been selected.
\ No newline at end of file