first round of merge conflicts