Fixed index after merging problems