"bar" alone remains in the file might be that it alphabetically comes before "foo". But what is the way to actually resolve the conflict? Best, Andres