commit branch
first new project commit
dsfdf
delete files
test.txt
resolved conflict
Merge branch 'v2.0'