Resolved conflicts.
Resolved conflicts