The update said that a header update was conflicting and that was it, which I permitted to let the changes be made. Everything else updated or merged appropriately.
I'm not sure if there's something else at work or not. Any help to fix this is appreciated.
Attached Images