Resolving conflicts.
Resolving conflicts.