diff --git a/salt/common/tools/sbin/so-elastic-clear b/salt/common/tools/sbin/so-elastic-clear
index b491c0453..f402876cb 100755
--- a/salt/common/tools/sbin/so-elastic-clear
+++ b/salt/common/tools/sbin/so-elastic-clear
@@ -13,11 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-<<<<<<< HEAD
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-=======
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.. /usr/sbin/so-common
->>>>>>> 08220e33... Issue #885: so-elastic-clear not removing so-* indices
 {%- set MASTERIP = salt['pillar.get']('static:masterip', '') -%}
 . /usr/sbin/so-common
 
@@ -67,10 +63,6 @@ if [ $SKIP -ne 1 ]; then
         if [ "$INPUT" != "AGREE" ] ; then exit 0; fi
 fi
 
-<<<<<<< HEAD
-/usr/sbin/so-filebeat-stop
-/usr/sbin/so-logstash-stop
-=======
 # Check to see if Logstash/Filebeat are running
 LS_ENABLED=$(so-status | grep logstash)
 FB_ENABLED=$(so-status | grep filebeat)
@@ -93,7 +85,6 @@ if [ ! -z "$EA_ENABLED" ]; then
         /usr/sbin/so-elastalert-stop
 
 fi
->>>>>>> 08220e33... Issue #885: so-elastic-clear not removing so-* indices
 
 # Delete data
 echo "Deleting data..."
@@ -104,10 +95,6 @@ do
     curl -XDELETE "{{ MASTERIP }}:9200/${INDX}" > /dev/null 2>&1
 done
 
-<<<<<<< HEAD
-/usr/sbin/so-logstash-start
-/usr/sbin/so-filebeat-start
-=======
 #Start Logstash/Filebeat
 if [ ! -z "$FB_ENABLED" ]; then
 
@@ -126,5 +113,4 @@ if [ ! -z "$EA_ENABLED" ]; then
         /usr/sbin/so-elastalert-start
 
 fi
->>>>>>> 08220e33... Issue #885: so-elastic-clear not removing so-* indices
 
diff --git a/test.test b/test.test
deleted file mode 100644
index e69de29bb..000000000