merged changes and resolved conflicts.