These are representations of conflicts that are stored as special files, they are not regular files with conflict markers in. If you look at the commit with reg

These are representations of conflicts that are stored as special files, they are not regular files with conflict markers in. If you look at the commit with regular `git`, you're going to see a weird file with some JSON in it.