diff --git a/config/CONFIG.pc486 b/config/CONFIG.pc486
index bb69b281c..5bfe523cc 100644
--- a/config/CONFIG.pc486
+++ b/config/CONFIG.pc486
@@ -1,10 +1,9 @@
-<<<<<<< CONFIG.pc486
+
 #
 # no longer required
 #
 #SHELL=knts
-=======
->>>>>>> 1.3
+
 
 # BUILD_TYPE
 #   Currently either Vx or Unix