Resolved some merge issues.