Added x in eof  line2
Added A in eof line1
Added B in eof line1
conflict: B remains in eof line1
A new file added