diff --git a/Shorewall-lite/sysconfig b/Shorewall-lite/sysconfig
index d60587cb1..8f708f81d 100644
--- a/Shorewall-lite/sysconfig
+++ b/Shorewall-lite/sysconfig
@@ -24,4 +24,3 @@ RELOADOPTIONS=""
 STOPOPTIONS=""
 
 # EOF
->>>>>>> 39caa74... Improved sysconfig files
diff --git a/Shorewall/sysconfig b/Shorewall/sysconfig
index d60587cb1..8f708f81d 100644
--- a/Shorewall/sysconfig
+++ b/Shorewall/sysconfig
@@ -24,4 +24,3 @@ RELOADOPTIONS=""
 STOPOPTIONS=""
 
 # EOF
->>>>>>> 39caa74... Improved sysconfig files
diff --git a/Shorewall6-lite/sysconfig b/Shorewall6-lite/sysconfig
index d60587cb1..8f708f81d 100644
--- a/Shorewall6-lite/sysconfig
+++ b/Shorewall6-lite/sysconfig
@@ -24,4 +24,3 @@ RELOADOPTIONS=""
 STOPOPTIONS=""
 
 # EOF
->>>>>>> 39caa74... Improved sysconfig files
diff --git a/Shorewall6/sysconfig b/Shorewall6/sysconfig
index d60587cb1..8f708f81d 100644
--- a/Shorewall6/sysconfig
+++ b/Shorewall6/sysconfig
@@ -24,4 +24,3 @@ RELOADOPTIONS=""
 STOPOPTIONS=""
 
 # EOF
->>>>>>> 39caa74... Improved sysconfig files