Fixed merging error