git doing funny things

deployment-script.sh

@@ -1 +1,2 @@
-#!/bin/bash
+#!/bin/bash
+#do nothing for now.

deployment-script_BACKUP_19041.sh

@@ -1,6 +0,0 @@
-<<<<<<< HEAD
-#!/bin/bash
-=======
-#!/bin/bash
-# Do nothing for now.
->>>>>>> jan

deployment-script_LOCAL_19041.sh

@@ -1 +0,0 @@
-#!/bin/bash

deployment-script_REMOTE_19041.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-# Do nothing for now.