Merge remote-tracking branch 'remotes/origin/master'

 enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge remote-tracking branch 'origin/test'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/test'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/test'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/test'

Conflicts:
	README.md
Merge branch 'next'

Conflicts:
	README.md
Merge branch 'test'

Conflicts:
	README.md
Merge branch 'test'

Conflicts:
	README.md
Merge branch 'test'

Conflicts:
	README.md
Merge branch 'test'

Conflicts:
	README.md