(and resolved a merge conflict)