Fixed the merging issue.