Fixed vcxproj Post-Merge

Hopefully I didn't break anything else.