Resolved conflicts
Resolved conflicts