I frequently encounter conflicts like this when merging branches. Anyone know where they come from? There is no useful info here to figure out what it is.
For context, this is a branch in the Components file. I guess the cause from changes in the Foundation file that are linked to Components, but I'm not sure.