ISSUE-23 fix the last chunk of mergin the options