fix merging strategy and attributes
corrected merge strategy and attribute removal