Fixed merging with parent