fix merging screw up