diff --git a/src/Maps/Controllers/BusStopController.cs b/src/Maps/Controllers/BusStopController.cs
index 46de845..b066b78 100755
--- a/src/Maps/Controllers/BusStopController.cs
+++ b/src/Maps/Controllers/BusStopController.cs
@@ -85,7 +85,7 @@ namespace Maps.Controllers
             return Json(vm);
         }
 
-<<<<<<< HEAD
+
         // POST: BusStop/Create
         // To protect from overposting attacks, please enable the specific properties you want to bind to, for 
         // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
@@ -106,7 +106,7 @@ namespace Maps.Controllers
             ViewData["SurfaceTypeId"] = new SelectList(_context.SurfaceType, "SurfaceTypeId", "SurfaceTypeId", busStop.SurfaceTypeId);
             return View(busStop);
         }
-=======
+
         [HttpDelete]
         public async Task<IActionResult> Delete(int? id)
         {
@@ -126,27 +126,6 @@ namespace Maps.Controllers
             return Json(busStop);
         }
 
-        // // POST: BusStop/Create
-        // // To protect from overposting attacks, please enable the specific properties you want to bind to, for 
-        // // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-        // [HttpPost]
-        // [ValidateAntiForgeryToken]
-        // public async Task<IActionResult> Create([Bind("BusStopId,AreaLandAvailability,AreaStopAvailability,BalanceCost,BusStationCardId,CrossSectionNumber,DateActual,LocationLeft,LocationRight,PocketAvailability,Position,RegionId,RepairCertificate,RoadId,SettlementId,StateCommonId,SurfaceTypeId,ToiletAvailability,YearBuild,YearRepair")] BusStop busStop)
-        // {
-        //     if (ModelState.IsValid)
-        //     {
-        //         _context.Add(busStop);
-        //         await _context.SaveChangesAsync();
-        //         return RedirectToAction("Index");
-        //     }
-        //     ViewData["RegionId"] = new SelectList(_context.Region, "RegionId", "RegionId", busStop.RegionId);
-        //     ViewData["RoadId"] = new SelectList(_context.Road, "RoadId", "RoadId", busStop.RoadId);
-        //     ViewData["SettlementId"] = new SelectList(_context.Settlement, "SettlementId", "Name", busStop.SettlementId);
-        //     ViewData["StateCommonId"] = new SelectList(_context.StateCommon, "StateCommonId", "StateCommonId", busStop.StateCommonId);
-        //     ViewData["SurfaceTypeId"] = new SelectList(_context.SurfaceType, "SurfaceTypeId", "SurfaceTypeId", busStop.SurfaceTypeId);
-        //     return View(busStop);
-        // }
->>>>>>> 94ffda14065b6ab5d25c52ed714e112165a70cae
 
         // // GET: BusStop/Edit/5
         // public async Task<IActionResult> Edit(int? id)
--
libgit2 0.21.4