ISSUE-125 - swapping the options and tag merge

This is a PR for 125