CRR docs
resolving conflict