tmux: More conflict resolution