Fixed merge issues

Author: jgauffin

src/Server/Coderr.Server.ReportAnalyzer/AnalysisDbContext.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using codeRR.Server.ReportAnalyzer;
 using Griffin.Data;
 using Microsoft.AspNetCore.Mvc.Filters;