fixing conflict

app/applicationlayer/management/batchupload/views.py

@@ -256,10 +256,8 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                         raise ParseError(
                             department_error
                         )
-<<<<<<< HEAD
 
                 # user type authorization and user type per user
-=======
                 else:
                     user_department = Department.objects.get(
                         name__icontains=keys['department']
@@ -268,7 +266,6 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                 default_app = Application.objects.filter(
                     excel_code=keys['default_app']
                 ).first()
->>>>>>> bd79850f02d697447131ae812adc4b42cf78960a
 
                 dept_code = Department.objects.get(
                     code=keys['Department_Code']