Git hates merges + moves/renames. Main problems have to do with FrameSettings management, and shifting of stuff into the more responsible SubsurfaceScatteringManager