Fixed merging difficulties