Update optins from update detail

Update optins from update detail
Conflict resolved

Conflict resolved