lib conflicts: Materialize (sides with (conflict markers) or (no newline at EOF)) in a way that can be parsed

lib conflicts: Materialize (sides with (conflict markers) or (no newline at EOF)) in a way that can be parsed #2892