Done.
Resolved conflicts.