Add a test,txt to test the branch of git
delete the oh.txt
chang in Dev branch
edit the test,txt in branch mast
remove the conflicts
commit in branch jtr
commite in branch of test.txt