Add o    o in eof #    #
Add o    o in eof #    #
Add o     o in eof #    #
Add ~    ~ in eof o    o
Add ~    ~ in eof #    #
Add ~    ~ in eof O    O
test
test
Conflict solved: b remains in eof Line 1
test