- Resolved conflicts