made an edit to the new branch
a conflicting edit in a master branch
yup