add merge msg
change README in master branch
conflict fixed