Added X in eof Line2
Added Y in eof Line5
Merge branch 'b1'
Added Z in eof Line1
Added W in eof Line1
Conflict corrected: Added Z in eof Line1
Added