branch test
create a feature branch
modify the READ file on master
conflict fixed
add read.txt