adding new File to the branch
modify newFile.txt
commit to produce conflict
create conflict
Creating conflict msln
conflict MERGED