Resolve conflicts.
Fixing more conflicts.