derp, fix the merge resolution