Fixed merging problem