updated merge.go with simple merge
Merge branch 'master' of github.com:SyntropyDev/merge