Another extant merge conflict is fixed