Fixed merging issue.