whoops, fix merge bug