bl0ndin / go-demo-6

Replace master with orig

git checkout orig

git merge -s ours master

git checkout master

git merge orig

git push