making a merge conflict
changes to oldBranch
fix merge conflicts