Fixed some merge issues.