fix: fixed dashboard cat and dashboard import to handle merge results properly#295

drstrangelooker merged 2 commits into

mainlooker-open-source/looker-cli:mainfrom

fix-merge-querylooker-open-source/looker-cli:fix-merge-queryCopy head branch name to clipboard