It's time to stop using merge commits. Disable them (and squashes) and just fast-forward all your commits!
