test master commit

	modified:   README.md
now is in master

	modified:   README.md
conflict fixed
test merge status
test git merger status

	modified:   README.md
merege with no-ff