let resolve_conflicts_first = "Resolve conflicts first."