fix bad merge -- oops