stop lying about fast-forward merges