change some settings
merge