Changes...
Merged csproj