Updated tmux shortcuts
Fixed merge conflict