a new file added
Added Y in eof Line5
Merge branches 'master' and 'b1'
Conflict: B remains in eof Line1
originalshortcat