Not planning to touch Core since it's the most actively changed part of the project.
Conflicts: Source/Core/Common/Src/CommonFuncs.h Source/Core/VideoCommon/Src/VertexLoader.cpp