Fix an accidental error that is added when resolving conflicts