Update conflict_resolver.md