setup repo remote and merge

requires [elasticgit #24](https://github.com/universalcore/elastic-git/pull/24)