Yeah. Specifically, I wanted to update my lnbits instance and when I did a git pull, it said it failed to merge because there was a bunch of changes. When I know for a fact, I haven't touched any of these files It's claiming have merge conflicts.