Fixing some merge conflicts.