fixed merging issue.