branch dev add new file dddd.txt
branch master update dddd.txt
branch dev update dddd.txt
conflict fixed