got rid of merge thing