user options
merge resolved
code