diff -r b321a3be0a38 -r c743721d566f docs/src/resolve-conflicts.md