Hi Gotcha,

Our git synchronization script tells me:

error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

then I investigated our local copy of your repository and I see:

~/activity_data/centralAdmin$ git status
On branch main
Your branch and 'origin/main' have diverged,
and have 2 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean

It looks like, at some point, you have added a file "LISEZMOI.md" but then a new commit says it was already added. Considering we make absolutely no change on our synched git repository, I see only one possibility : you have performed a "git push --force" after changing your commits locally. Am I right?