Fixed some remaining merge conflicts.