Reverted .csproj file
Finished cleaning up merge.