manual fix of a merge screw up