fix merge problem #2