added merging of features