maj on window
add reset config
merge