diff --git a/parm/postxconfig-NT-fv3lam_rrfs.txt b/parm/postxconfig-NT-fv3lam_rrfs.txt
index 65c205129..1d54f5fa1 100644
--- a/parm/postxconfig-NT-fv3lam_rrfs.txt
+++ b/parm/postxconfig-NT-fv3lam_rrfs.txt
@@ -2,11 +2,7 @@
 4
 3
 250
-<<<<<<< HEAD
 311
-=======
-308
->>>>>>> origin/develop
 PRSLEV
 32769
 ncep_nco