Fixes merge conflicts

Author: joncloud

tests/https.Tests/Startup.cs

@@ -6,7 +6,7 @@ namespace Https.Tests
 {
     public class Startup
     {   
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
             app.UseMiddleware<RedirectMiddleware>();
             app.UseMiddleware<MirrorMiddleware>();