get rid of stupid empty merges via rebase