diff --git a/pgsql13-primary-centos8/conf/postgresql.conf b/pgsql13-primary-centos8/conf/postgresql.conf
index e1a5e5c..9c88ebb 100644
--- a/pgsql13-primary-centos8/conf/postgresql.conf
+++ b/pgsql13-primary-centos8/conf/postgresql.conf
@@ -691,19 +691,11 @@ timezone = 'America/New_York'
 					# encoding
 
 # These settings are initialized by initdb, but they can be changed.
-<<<<<<< HEAD:pgsql13-primary-centos8/conf/postgresql.conf
 # lc_messages = 'en_US.UTF-8'                     # locale for system error message
 #                                         # strings
 # lc_monetary = 'en_US.UTF-8'                     # locale for monetary formatting
 # lc_numeric = 'en_US.UTF-8'                      # locale for number formatting
 # lc_time = 'en_US.UTF-8'                         # locale for time formatting
-=======
-# lc_messages = 'en_US.UTF-8'			# locale for system error message
-# 					# strings
-# lc_monetary = 'en_US.UTF-8'			# locale for monetary formatting
-# lc_numeric = 'en_US.UTF-8'			# locale for number formatting
-# lc_time = 'en_US.UTF-8'				# locale for time formatting
->>>>>>> 05701ee (Disable lc_ UTF8):pgsql12-primary-centos8/conf/postgresql.conf
 
 # default configuration for text search
 default_text_search_config = 'pg_catalog.english'