##user B modified newfile firstly
Merge branch 'master' of /home/user2/merger/projecta