commit new file
commit new content
Update newfile.txt
New merge from master