Changed prefix key for tmux
Fixed merge conflict
Fixed merge conflict