diff --git a/apps/paf/models/file-upload.js b/apps/paf/models/file-upload.js
index 72dd2dda..db94ae8a 100644
--- a/apps/paf/models/file-upload.js
+++ b/apps/paf/models/file-upload.js
@@ -1,11 +1,5 @@
-<<<<<<< HEAD
-/* eslint-disable node/no-deprecated-api */
-'use strict';
-/* eslint-disable */
-=======
 'use strict';
 
->>>>>>> 84527e4 (PAF-11: create attachments)
 const url = require('url');
 const Model = require('hof').model;
 const uuid = require('uuid').v4;
diff --git a/kube/file-vault/file-vault-deployment.yml b/kube/file-vault/file-vault-deployment.yml
index 45c7cc1b..1e966cce 100644
--- a/kube/file-vault/file-vault-deployment.yml
+++ b/kube/file-vault/file-vault-deployment.yml
@@ -56,11 +56,19 @@ spec:
               value: "0"
             - name: FILE_VAULT_URL
             {{ if eq .KUBE_NAMESPACE .PROD_ENV }}
+<<<<<<< HEAD
               value: https://fv-paf.sas.homeoffice.gov.uk
             {{ else if eq .KUBE_NAMESPACE .STG_ENV }}
               value: https://fv-paf.stg.sas.homeoffice.gov.uk
             {{ else if eq .KUBE_NAMESPACE .UAT_ENV }}
               value: https://fv-paf.uat.sas-notprod.homeoffice.gov.uk
+=======
+              value: fv-paf.sas.homeoffice.gov.uk
+            {{ else if eq .KUBE_NAMESPACE .STG_ENV }}
+              value: fv-paf.stg.sas.homeoffice.gov.uk
+            {{ else if eq .KUBE_NAMESPACE .UAT_ENV }}
+              value: fv-paf.uat.sas-notprod.homeoffice.gov.uk
+>>>>>>> ce4244b (Fix discrepancies between fv URLs across deployments and ingress (#122))
             {{ else if eq .KUBE_NAMESPACE .BRANCH_ENV }}
               value: https://fv-{{ .DRONE_SOURCE_BRANCH }}.{{ .BRANCH_ENV }}.homeoffice.gov.uk
             - name: DEBUG
@@ -119,11 +127,19 @@ spec:
                   key: id
             - name: PROXY_REDIRECTION_URL
             {{ if eq .KUBE_NAMESPACE .PROD_ENV }}
+<<<<<<< HEAD
               value: https://fv-paf.sas.homeoffice.gov.uk
             {{ else if eq .KUBE_NAMESPACE .STG_ENV }}
               value: https://fv-paf.stg.sas.homeoffice.gov.uk
             {{ else if eq .KUBE_NAMESPACE .UAT_ENV }}
               value: https://fv-paf.uat.sas-notprod.homeoffice.gov.uk
+=======
+              value: fv-paf.sas.homeoffice.gov.uk
+            {{ else if eq .KUBE_NAMESPACE .STG_ENV }}
+              value: fv-paf.stg.sas.homeoffice.gov.uk
+            {{ else if eq .KUBE_NAMESPACE .UAT_ENV }}
+              value: fv-paf.uat.sas-notprod.homeoffice.gov.uk
+>>>>>>> ce4244b (Fix discrepancies between fv URLs across deployments and ingress (#122))
             {{ else if eq .KUBE_NAMESPACE .BRANCH_ENV }}
               value: https://fv-{{ .DRONE_SOURCE_BRANCH }}.{{ .BRANCH_ENV }}.homeoffice.gov.uk
             {{ end }}