Apply finishing touches.
Fix merge conflicts.