comments on where merge conflicts where in code