fix merging features