diff --git a/cam.jpg b/cam.jpg
index 67a3a69..c77bc07 100644
Binary files a/cam.jpg and b/cam.jpg differ
diff --git a/effects/Vignette-1.sh b/effects/Vignette-1.sh
index 8cb4b0e..b7f06b3 100755
--- a/effects/Vignette-1.sh
+++ b/effects/Vignette-1.sh
@@ -1,3 +1,7 @@
 #!/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 2c99787..a746678 100755
--- a/effects/Vignette-2.sh
+++ b/effects/Vignette-2.sh
@@ -1,2 +1,6 @@
 #!/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/effects/grad_vignette_1.png b/effects/grad_vignette_1.png
index d0f25e4..093b40f 100644
Binary files a/effects/grad_vignette_1.png and b/effects/grad_vignette_1.png differ
diff --git a/effects/grad_vignette_2.png b/effects/grad_vignette_2.png
index 89adfba..5125010 100644
Binary files a/effects/grad_vignette_2.png and b/effects/grad_vignette_2.png differ
diff --git a/switch.py b/switch.py
index f97f33b..0e59198 100644
--- a/switch.py
+++ b/switch.py
@@ -4,7 +4,7 @@ import subprocess
 import os
 import random
 
-shell_list = ['/home/pi/effects/Gotham.sh', '/home/pi/effects/Lomo.sh', '/home/pi/effects/Lomo-vignette.sh', '/home/pi/effects/Nashville.sh', '/home/pi/effects/Redstone.sh', '/home/pi/effects/Toaster.sh', '/home/pi/effects/Vignette-1.sh', '/home/pi/effects/Vignette-2.sh', '/home/pi/effects/Vintage.sh']
+shell_list = ['/home/pi/effects/Gotham.sh', '/home/pi/effects/Lomo.sh', '/home/pi/effects/Nashville.sh', '/home/pi/effects/Redstone.sh', '/home/pi/effects/Toaster.sh', '/home/pi/effects/Vignette-1.sh', '/home/pi/effects/Vignette-2.sh', '/home/pi/effects/Vintage.sh']
 
 GPIO.setmode(GPIO.BCM)
 
@@ -13,7 +13,11 @@ 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)