Fixed merging error.