fix optionActivity logic
merge