add test.txt
add  newmaster.txt
modify dev.txt
modif dev
fixed conflict
mod de
merge fixed bug