Some Changes
Updated .tmux.conf
Resolved conflict