getting rid of merge conflicts