oops, fix a merge problem