Update tmux
Fix conflict