removed merge garbage