DOC: added a note on commit comments for merges with Conflicts