got rid of merge conflicts