Resolved some merge issues