took out junk from merge