master
'test'
gitignore
remove file
iiiii
add the new file ccc.txt
first commit
merge
test branch conflict test