comments on how to resolve git conflict