ISSUE-23 fix the mergin of options