rerere: add documentation for conflict normalization