fix merge problem #3