changed options section
merge resolved