Fixed merge garbage