fix merge messup