diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/ExtentionDrawningBus.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/ExtentionDrawningBus.cs
index ec734f2..81c948d 100644
--- a/projectDoubleDeckerBus/projectDoubleDeckerBus/ExtentionDrawningBus.cs
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/ExtentionDrawningBus.cs
@@ -5,12 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using projectDoubleDeckerBus.Entity;
 using projectDoubleDeckerBus.Drawings;
-<<<<<<< HEAD
-=======
 
-
-
->>>>>>> 86820b55e1e9fba5d9b93973533143ca71f94485
 namespace projectDoubleDeckerBus
 {
     public static class ExtentionDrawningBus