diff --git a/DCIM/.gitkeep b/DCIM/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/effects/Gotham.sh2 b/effects/Gotham.sh2
new file mode 100644
index 0000000..5aa153f
--- /dev/null
+++ b/effects/Gotham.sh2
@@ -0,0 +1,2 @@
+#!/bin/bash
+convert /home/elektroll/git/PiMo/cam.jpg -modulate 120,10,100 -fill '#222b6d' -colorize 20 -gamma 0.5 /home/elektroll/git/PiMo/DCIM/$(x="$(ls -v /home/elektroll/git/PiMo/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x+1 | bc).jpg
diff --git a/effects/Vignette-1.sh b/effects/Vignette-1.sh
index b7f06b3..9752bdd 100755
--- a/effects/Vignette-1.sh
+++ b/effects/Vignette-1.sh
@@ -1,7 +1,3 @@
 #!/bin/bash
-<<<<<<< HEAD
 composite -gravity center -resize 1251x1039 /home/pi/effects/grad_vignette_1.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
-=======
-composite -gravity center -resize 3908x2602 grad_vignette_1.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
->>>>>>> 45f87ca66a1f5f1055aadf6095918a1859c3e690
 
diff --git a/effects/Vignette-2.sh b/effects/Vignette-2.sh
index a746678..050b3da 100755
--- a/effects/Vignette-2.sh
+++ b/effects/Vignette-2.sh
@@ -1,6 +1,2 @@
 #!/bin/bash
-<<<<<<< HEAD
 composite -gravity center -resize 1251x1039 /home/pi/effects/grad_vignette_2.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
-=======
-composite -gravity center -resize 3908x2602 grad_vignette_2.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
->>>>>>> 45f87ca66a1f5f1055aadf6095918a1859c3e690
diff --git a/switch.py b/switch.py
index 0e59198..ff0c15a 100644
--- a/switch.py
+++ b/switch.py
@@ -13,11 +13,6 @@ GPIO.setup(18, GPIO.IN, pull_up_down=GPIO.PUD_UP)
 while True:
     input_state = GPIO.input(18)
     if input_state == False:
-<<<<<<< HEAD
         subprocess.call(["raspistill","-n", "-w", "1251", "-h", "1039", "-ISO", "200", "-t", "1","-o", "cam.jpg"])
-=======
-        subprocess.call(["touch","/home/pi/DCIM/0.jpg"])
-        subprocess.call(["raspistill","-n", "-w", "1251", "-h", "1039", "-vf", "-hf", "-ISO", "200", "-t", "1","-o", "cam.jpg"])
->>>>>>> 45f87ca66a1f5f1055aadf6095918a1859c3e690
         os.system(random.choice(shell_list))
     time.sleep(0.2)