Fast-Forward merges for the GitHub merge button (wip)