reset and settings
merge