better merge commit messages