Minor.
Resolving conflicts.