user options
merge resolved