Fixed the merge issues.