got rid of merge junk