Bernice's changes to the same line
fixed merge conflict