Conflict test

Writing over the same line, trying to figure out how to choose the
desired correction
changed to 77+1