diff --git a/inventory/forms.py b/inventory/forms.py
index be5fd1ee..67b6bb18 100644
--- a/inventory/forms.py
+++ b/inventory/forms.py
@@ -24,11 +24,8 @@ from .models import (
     SaleQuotationCar,
     AdditionalServices,
     Staff,
-<<<<<<< HEAD
-=======
     Opportunity
 
->>>>>>> 8b00f9a40fc336f209f4ae6fb03785df6c97d265
 )
 from django_ledger.models import ItemModel, InvoiceModel
 from django.forms import ModelMultipleChoiceField, ValidationError
@@ -532,7 +529,6 @@ class ItemForm(forms.Form):
     unit_sales_price = forms.DecimalField(label="Unit Sales Price", required=True)
 
 
-<<<<<<< HEAD
 class PaymentForm(forms.Form):
     invoice = forms.ModelChoiceField(
         queryset=InvoiceModel.objects.all(), label="Invoice", required=True
@@ -559,7 +555,8 @@ class EmailForm(forms.Form):
     message = forms.CharField(widget=forms.Textarea)
     from_email = forms.EmailField()
     to_email = forms.EmailField()
-=======
+
+
 class OpportunityForm(forms.ModelForm):
     class Meta:
         model = Opportunity
@@ -571,5 +568,4 @@ class OpportunityForm(forms.ModelForm):
             'deal_status': forms.Select(choices=Opportunity.DEAL_STATUS_CHOICES),
             'priority': forms.Select(choices=Opportunity.PRIORITY_CHOICES),
             'source': forms.Select(choices=Opportunity.DEAL_SOURCES_CHOICES),
-        }
->>>>>>> 8b00f9a40fc336f209f4ae6fb03785df6c97d265
+        }
\ No newline at end of file