diff --git a/lib/core/constants/assets.dart b/lib/core/constants/assets.dart
index f62c2fe..1ed0338 100644
--- a/lib/core/constants/assets.dart
+++ b/lib/core/constants/assets.dart
@@ -20,12 +20,9 @@ class AssetsManager {
   static const location = 'assets/icons/location.svg';
   static const arrowCircleLeft = 'assets/icons/arrow-circle-left.svg';
   static const arrowCircleRight = 'assets/icons/arrow-circle-right.svg';
-<<<<<<< HEAD
 
   //your tenders page
   static const tickCircle = 'assets/icons/tick-circle.svg';
-=======
   static const arrowLeft = 'assets/svgs/arrow_left.svg';
   static const export = 'assets/svgs/export.svg';
->>>>>>> 92b89fdea46b90000b1e2c986d973dd8161fb7cb
 }