modif realNew.txt, branche uenBranche
modif realNew.txt from myBranch
modif realNew.txt from master
commit merge