diff --git a/conf/config.sh-confluence-sample b/conf/config.sh-confluence-sample
index e505933..a833988 100644
--- a/conf/config.sh-confluence-sample
+++ b/conf/config.sh-confluence-sample
@@ -4,41 +4,9 @@ NO=1
 ### START OF USER CONFIGURABLE SECTION
 #
 #
-
-<<<<<<< HEAD
-=======
-<<<<<<<< HEAD:conf/config.sh-jira-sample
-# These must be set or scripts will refuse to run
-# If no changes needed, set them the same
-IPADDR_OLD=
-IPADDR_NEW=$IPADDR_OLD
-
-HOSTNAME_OLD=
-HOSTNAME_NEW=$HOSTNAME_OLD
-
-# path to jira / confluence home & install dirs
-APP_NAME=jira
-APP_HOME_DIR=/usr/services/jirahome
-APP_INSTALL_DIR=/usr/services/jira-standalone
-
-# Jira/Confluence DB names
-# If no changes needed, set them the same
-# (if both are the same, no updates will be attempted)
-# TODO - can be removed once all databases are local
-DB_NAME_OLD=
-DB_NAME_NEW=$DB_NAME_OLD
-
-# arrays of service names
-# TODO - remove CRASHPLAN when no longer appropriate
-SYSTEM_SERVICES_TO_STOP=( puppet telegraf crashplan $APP_NAME )
-PUPPET_SERVICES_TO_STOP=( telegraf )
-
-========
->>>>>>>> 62ba8ad (SVCPLAN-4857 new script to run generic SQL on a remote PG server):conf/config.sh-confluence-sample
 VERBOSE=$YES
 DEBUG=$YES
 
->>>>>>> 62ba8ad (SVCPLAN-4857 new script to run generic SQL on a remote PG server)
 # These must be set or scripts will refuse to run
 # If no changes needed, set them the same
 IPADDR_OLD=
@@ -49,9 +17,12 @@ HOSTNAME_NEW=$HOSTNAME_OLD
 
 # path to jira / confluence home & install dirs
 APP_NAME=confluence
-<<<<<<< HEAD
-APP_HOME_DIR=/srv/confluence/home
-APP_INSTALL_DIR=/srv/confluence/app
+APP_HOME_DIR=/srv/$APP_NAME/home
+APP_INSTALL_DIR=/srv/$APP_NAME/app
+
+# arrays of service names
+SYSTEM_SERVICES_TO_STOP=( puppet telegraf xcatpostinit1 $APP_NAME )
+PUPPET_SERVICES_TO_STOP=( telegraf )
 
 # Jira/Confluence DB names
 # If no changes needed, set them the same
@@ -60,22 +31,6 @@ APP_INSTALL_DIR=/srv/confluence/app
 DB_NAME_OLD=
 DB_NAME_NEW=$DB_NAME_OLD
 
-# arrays of service names
-SYSTEM_SERVICES_TO_STOP=( puppet telegraf $APP_NAME )
-PUPPET_SERVICES_TO_STOP=( telegraf )
-
-VERBOSE=$YES
-DEBUG=$YES
-
-=======
-APP_HOME_DIR=/srv/$APP_NAME/home
-APP_INSTALL_DIR=/srv/$APP_NAME/app
-
-# arrays of service names
-SYSTEM_SERVICES_TO_STOP=( puppet telegraf xcatpostinit1 $APP_NAME )
-PUPPET_SERVICES_TO_STOP=( telegraf )
-
->>>>>>> 62ba8ad (SVCPLAN-4857 new script to run generic SQL on a remote PG server)
 #
 #
 ### END OF USER CONFIGURABLE SECTION
diff --git a/conf/config.sh-jira-sample b/conf/config.sh-jira-sample
index c37b19c..fa424f5 100644
--- a/conf/config.sh-jira-sample
+++ b/conf/config.sh-jira-sample
@@ -4,38 +4,6 @@ NO=1
 ### START OF USER CONFIGURABLE SECTION
 #
 #
-
-<<<<<<< HEAD
-<<<<<<<< HEAD:conf/config.sh-jira-sample
-# These must be set or scripts will refuse to run
-# If no changes needed, set them the same
-IPADDR_OLD=
-IPADDR_NEW=$IPADDR_OLD
-
-HOSTNAME_OLD=
-HOSTNAME_NEW=$HOSTNAME_OLD
-
-# path to jira / confluence home & install dirs
-APP_NAME=jira
-APP_HOME_DIR=/usr/services/jirahome
-APP_INSTALL_DIR=/usr/services/jira-standalone
-
-# Jira/Confluence DB names
-# If no changes needed, set them the same
-# (if both are the same, no updates will be attempted)
-# TODO - can be removed once all databases are local
-DB_NAME_OLD=
-DB_NAME_NEW=$DB_NAME_OLD
-
-# arrays of service names
-# TODO - remove CRASHPLAN when no longer appropriate
-SYSTEM_SERVICES_TO_STOP=( puppet telegraf crashplan $APP_NAME )
-PUPPET_SERVICES_TO_STOP=( telegraf )
-
-========
->>>>>>>> 62ba8ad (SVCPLAN-4857 new script to run generic SQL on a remote PG server):conf/config.sh-confluence-sample
-=======
->>>>>>> 62ba8ad (SVCPLAN-4857 new script to run generic SQL on a remote PG server)
 VERBOSE=$YES
 DEBUG=$YES
 
@@ -48,15 +16,9 @@ HOSTNAME_OLD=
 HOSTNAME_NEW=$HOSTNAME_OLD
 
 # path to jira / confluence home & install dirs
-<<<<<<< HEAD
-APP_NAME=confluence
-APP_HOME_DIR=/srv/$APP_NAME/home
-APP_INSTALL_DIR=/srv/$APP_NAME/app
-
-# arrays of service names
-SYSTEM_SERVICES_TO_STOP=( puppet telegraf xcatpostinit1 $APP_NAME )
-=======
 APP_NAME=jira
+#APP_HOME_DIR=/usr/services/jirahome
+#APP_INSTALL_DIR=/usr/services/jira-standalone
 APP_HOME_DIR=/srv/${APP_NAME}/home
 APP_INSTALL_DIR=/srv/${APP_NAME}/app
 
@@ -64,13 +26,14 @@ APP_INSTALL_DIR=/srv/${APP_NAME}/app
 # If no changes needed, set them the same
 # (if both are the same, no updates will be attempted)
 # TODO - can be removed once all databases are local
-DB_NAME_OLD=confluencedb
+DB_NAME_OLD=jira5
 DB_NAME_NEW=$DB_NAME_OLD
+#DB_NAME_NEW=jira5test
 
 # arrays of service names
 # TODO - remove CRASHPLAN when no longer appropriate
-SYSTEM_SERVICES_TO_STOP=( puppet telegraf crashplan xcatpostinit1 $APP_NAME )
->>>>>>> 62ba8ad (SVCPLAN-4857 new script to run generic SQL on a remote PG server)
+SYSTEM_SERVICES_TO_STOP=( puppet telegraf crashplan $APP_NAME )
+#SYSTEM_SERVICES_TO_STOP=( puppet telegraf xcatpostinit1 $APP_NAME )
 PUPPET_SERVICES_TO_STOP=( telegraf )
 
 #