got rid of merge garbage