fixed unmerged vcxproj.filters and repaired Conversions.cpp