[hints]
resolving-conflicts = true