diff --git a/docker/run.sh b/docker/run.sh
index 25d3aa71..c6e0aa96 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -102,52 +102,27 @@ echo "Starting Docker container for 5irechain node"
 
 case $command in
   fullnode)
-<<<<<<< HEAD
-<<<<<<< HEAD
     docker run --name 5ire$environment -d -p 30333:30333 -p 9944:9944 5irenode:$environment \
-=======
-    docker run --name 5ire"$environment" -it -p 30333:30333 -p 9944:9944 5irenode:$environment \
->>>>>>> 480bfa1 (made scripts executable and fixed run issue)
-=======
-    docker run --name 5ire$environment -d -p 30333:30333 -p 9944:9944 5irenode:$environment \
->>>>>>> 2c4c3ce (updated readme and running docker container in detach mode)
       --base-path /5ire/data --chain /5ire/specs/5ire-$environment-specRaw.json --port 30333 \
       --rpc-port 9944 --pruning archive --name TestFullnode --rpc-external --rpc-cors all \
       --rpc-methods Unsafe --unsafe-rpc-external --rpc-max-connections 40000 \
       --bootnodes "/ip4/$bootnode_ip/tcp/30333/p2p/$bootnode_id"
     ;;
   validator)
-<<<<<<< HEAD
-<<<<<<< HEAD
-    docker run --name 5ire$environment -d -p 30333:30333 -p 9944:9944 5irenode:$environment \
-=======
-    docker run --name 5ire"$environment" -it -p 30333:30333 -p 9944:9944 5irenode:$environment \
->>>>>>> 480bfa1 (made scripts executable and fixed run issue)
-=======
+
     docker run --name 5ire$environment -d -p 30333:30333 -p 9944:9944 5irenode:$environment \
->>>>>>> 2c4c3ce (updated readme and running docker container in detach mode)
       --base-path /5ire/data --chain /5ire/specs/5ire-$environment-specRaw.json --port 30333 \
       --rpc-port 9944 --name TestValidator --rpc-external --rpc-cors all \
       --rpc-methods Unsafe --unsafe-rpc-external --validator \
       --bootnodes "/ip4/$bootnode_ip/tcp/30333/p2p/$bootnode_id"
     ;;
   archivenode)
-<<<<<<< HEAD
-<<<<<<< HEAD
-    docker run --name 5ire$environment -d -p 30333:30333 -p 9944:9944 5irenode:$environment \
-=======
-    docker run --name 5ire"$environment" -it -p 30333:30333 -p 9944:9944 5irenode:$environment \
->>>>>>> 480bfa1 (made scripts executable and fixed run issue)
-=======
     docker run --name 5ire$environment -d -p 30333:30333 -p 9944:9944 5irenode:$environment \
->>>>>>> 2c4c3ce (updated readme and running docker container in detach mode)
       --base-path /5ire/data --chain /5ire/specs/5ire-$environment-specRaw.json --pruning archive \
       --name TestArchive --no-telemetry --bootnodes "/ip4/$bootnode_ip/tcp/30333/p2p/$bootnode_id"
     ;;
 esac
 
-<<<<<<< HEAD
-docker logs -f 5ire$environment
-=======
+
 docker logs -f 5ire$environment
->>>>>>> 2c4c3ce (updated readme and running docker container in detach mode)
+
diff --git a/docker/upload.sh b/docker/upload.sh
index a46569de..2ce67a28 100755
--- a/docker/upload.sh
+++ b/docker/upload.sh
@@ -23,15 +23,7 @@ while [[ $# -gt 0 ]]; do
   case $1 in
     -e)
       environment="$2"
-<<<<<<< HEAD
-<<<<<<< HEAD
       if [ "$environment" != "qa" ] && [ "$environment" != "thunder" ]; then
-=======
-      if [ "$environment" != "qa" ] || [ "$environment" != "thunder" ]; then
->>>>>>> cdb6b8a (updated validator nodes flags, added scripts readme & added upload.sh)
-=======
-      if [ "$environment" != "qa" ] && [ "$environment" != "thunder" ]; then
->>>>>>> a325111 (fixed environment check)
         echo "Invalid Environment '$environment'. Only 'qa' and 'thunder' envrionments are allowed at the moment"
         exit 1
       fi
@@ -75,8 +67,5 @@ if [ "$environment" == "qa" ]; then
 elif [ "$environment" == "thunder" ]; then
   docker tag 5irenode$environment 5irechain/5ire-thunder-node:$TAG
   docker push 5irechain/5ire-thunder-node:$TAG
-<<<<<<< HEAD
-fi
-=======
 fi
->>>>>>> cdb6b8a (updated validator nodes flags, added scripts readme & added upload.sh)
+