Collects Critical Info
Resolved Conflict