Accidentally commited changes VS made to the vcxproj files.
Revert "Resolved merge conflict."

This reverts commit 33fa201dcb5c185a998b4c4a8ccafdb77115c18d.