Fixed merging problems