Workaround git reset bug in automerge