Ugur,
I went back to solution manager to generate the xml file, on the add-ons, I have omitted the latest conflicting UI2_700 component, during that time it was if not mistaken SP09 thus on those I choose SP08. Restarted the upgrade and there were no more conflicts and all went well.
Kind regards,
CK