Fixed merging issues.