AND simple
& simple
change README.md
commit in Feature1 branch
commit in master branch
conflic fixed