Fix error in ours/theirs.