add tmuxconf
merge
merging