Update Rock.csproj

Remove trailing merge comment