Fixed some merge problems.