Revert vcxproj files after merge