Fix Git's bad merge.