Fixed some merge mistakes.