<<<<<<< HEAD merge - conflicts content added by dev-3 in newbranch merge conflicts content added by dev-1 in newbranch newbranch