Make small changes.
Fix merge conflicts.