adding branch merge conflicts