fix merge #2