* Stefan Richter <firstname.lastname@example.org> wrote:
what type of conflict do you have there? If it's a new entry then you
might be able to fix it by moving the new entry elsewhere in the file.
Or if i introduced a new entry close to an existing entry you modify
then i could move my new entry elsewhere.