settings assets added
merge