Fixed merge errors in PGPRSATest.cs and crypto.csproj