Fixed some merge conflicts.