oops, fix a merge bug