diff --git a/etc/dm.deploy.conf b/etc/dm.deploy.conf
index 596086fb42b01774845af4e90ee0bee695d27302..1d1a25d8ef180a1ee1c5e7889bd6e85c59faee1c 100644
--- a/etc/dm.deploy.conf
+++ b/etc/dm.deploy.conf
@@ -14,11 +14,7 @@ DM_DAQ_WEB_SERVICE_URL=https://DM_HOSTNAME:33336
 DM_CAT_WEB_SERVICE_URL=https://DM_HOSTNAME:44436
 DM_PROC_WEB_SERVICE_URL=https://DM_HOSTNAME:55536
 DM_APS_DB_WEB_SERVICE_URL=https://DM_HOSTNAME:11236
-<<<<<<< HEAD
 DM_SOFTWARE_VERSION=3.3.2
-=======
-DM_SOFTWARE_VERSION=3.3.2
->>>>>>> master
 LDAP_SERVER_URL='ldaps://dmid-vm.xray.aps.anl.gov:636'
 LDAP_DN_FORMAT='uid=%%s,ou=people,o=aps.anl.gov,dc=aps,dc=anl,dc=gov'
 LDAP_UTIL_ADMIN_DN='uid=DM_SYSTEM_UNIX_ACCOUNT,ou=People,o=aps.anl.gov,dc=aps,dc=anl,dc=gov'