got rid of merge code