add tmux conf
merge