diff --git a/README.md b/README.md
index 3b6188b5c..28ed2a42f 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,11 @@
 
 ### ISO Download:
 
-[HH1.1.3-20.iso](https://github.com/Security-Onion-Solutions/securityonion-hh-iso/releases/download/HH1.1.3/HH-1.1.3-20.iso)  
-MD5: 5A97980365A2A63EBFABB8C1DEB32BB6  
-SHA1: 2A780B41903D907CED91D944569FD24FC131281F  
-SHA256: 56FA65EB5957903B967C16E792B17386848101CD058E0289878373110446C4B2
+[HH1.1.3-21.iso](https://github.com/Security-Onion-Solutions/securityonion-hh-iso/releases/download/HH1.1.3/HH-1.1.3-21.iso)  
+MD5: 0FDACF6A2BB63B390C4D7FA46CCA3AA5  
+SHA1: 20506D5C535CF5D0E2F7440C8ACBE9D318049B7D  
+SHA256: EAEE7DC173F0E91BED43BDA13A84A20167975B5F7BD6598BE2D434AB29EAC51B
+
 
 ```
 Default Username: onion
diff --git a/setup/so-functions b/setup/so-functions
index b9367890d..f4c2eb621 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1034,11 +1034,19 @@ EOF
     fi
 
     yum clean expire-cache
+<<<<<<< HEAD:setup/so-functions
     yum -y install epel-release salt-minion-2019.2.3 yum-utils device-mapper-persistent-data lvm2 openssl jq
     yum -y update exclude=salt*
     systemctl enable salt-minion
 
     if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ] || [ $INSTALLTYPE == 'HELIXSENSOR' ] || [ $INSTALLTYPE == 'MASTERSEARCH' ]; then
+=======
+    yum -y install epel-release salt-minion-2019.2.3 yum-utils device-mapper-persistent-data lvm2 openssl
+    yum -y update exclude=salt*
+    systemctl enable salt-minion
+
+    if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ] || [ $INSTALLTYPE == 'HELIXSENSOR' ]; then
+>>>>>>> master:setup/functions.sh
       yum -y install salt-master-2019.2.3 python3 python36-m2crypto salt-minion-2019.2.3 python36-dateutil python36-mysql python36-docker
       systemctl enable salt-master
     else