Some changes.
Resolving merge conflicts.