commented AutoTalent patch
dealing with a merge conflict
How some differences with origin's includes and patches.cpp, should now be ok