Minor changes.
Merge conflict fixed.