Don't need local tmux conf files
Use diff3 merge conflict style