tmux conf change
merged tmux conf