'BUG: There are unmerged index entries

I am trying to merge with a branch, and this is the error I'm getting:

BUG: There are unmerged index entries:
BUG: 2 src/assets/svg/arrow-black.svg
BUG: merge-recursive.c:429: unmerged index entries in merge-recursive.c

I don't really know what else to add. I've been searching, but I saw the exact same explanation on 5 different websites, and it doesn't help

Recreating the branch doesn't help

git

Sources

This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.

Solution	Source