add failing test for merging
merge remote after setting workspace
bolster tests
Merge pull request #48 from universalcore/feature/issue-48-fix-merge-remote-step

fix merge remote step