cleaning up the merge conflict lines. silly.