Cleanup.
Resolving merge conflicts.