dev branch add file readme.txt
add content 888888888888
master branch add 9999999999999
conflict fixed