fix merge problem #5