finally have a decent tmux config
fix conflicts