branch test
branch conflict
make a conflict between branch
conflict fixed
add new file