Merged and resolved conflicts.