settings added
merge