Lots of updates

config/i3/configWork

@@ -355,7 +355,8 @@ exec --no-startup-id xfce4-clipman
 #exec_always --no-startup-id sleep 1s; killall -9 conky
 exec --no-startup-id xrandr --output DP-1 --primary --mode 2560x1440 --pos 1440x0 --rotate normal --output HDMI-1 --mode 1440x900 --pos 0x0 --rotate normal --output HDMI-2 --off
 exec_always --no-startup-id /usr/lib/xfce4/notifyd/xfce4-notifyd
-exec --no-startup-id sh ~/.fehbg
+#exec --no-startup-id sh ~/.fehbg
+exec --no-startup-id nitrogen --restore
 exec_always --no-startup-id sh "/home/jonathan/.config/conky/conky-startup.sh"
 #exec --no-startup-id conky -c "/home/jonathan/.config/conky/BibleVerse/bibleGateway"
 #exec --no-startup-id conky -c "/home/jonathan/.config/conky/MyBlue/MyBlue"

config/oh-my-zsh/aliases.zsh

@@ -46,6 +46,8 @@ alias ch='git checkout'
 alias push='git push '
 alias pull='git pull '
 alias bb='git open'
+alias merge='git merge'
+alias mg='git merge'
 
 # Always make grep ouput color
 alias grep="grep --color=auto"