Correcting messed-up merge of Architecture.csproj