Resolving conflicts.
Resolved issues.