Remove merge garbage