add tmuxconf
merge