fixed merge issues.