change in branch
changes to conflict with local branch
Merge branch 'master' of github.com:develop-me/git
final version
Merge branch 'master' of github.com:develop-me/git