Finish the merge conflict!