fix merge garbage