Strip trailing spaces from tmux history
Fix merge conflicts