second check
masterupdate
new java file
master update
final change
master
Merge branch 'master' of local repository into newbranch