Update conflict_resolver.md

Fixed formatting