diff --git a/PROJECT b/PROJECT
index d101b394..affc699a 100644
--- a/PROJECT
+++ b/PROJECT
@@ -41,9 +41,6 @@ resources:
   controller: true
   domain: nvidia.com
   group: apps
-<<<<<<< HEAD
-  kind: NemoCustomizer
-=======
   kind: NemoEvaluator
   path: github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1
   version: v1alpha1
@@ -72,7 +69,15 @@ resources:
   domain: nvidia.com
   group: apps
   kind: NemoGuardrails
->>>>>>> 4cb6b28 (Fix project scaffolding for all microservices)
+  path: github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1
+  version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: nvidia.com
+  group: apps
+  kind: NemoCustomizer
   path: github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1
   version: v1alpha1
 version: "3"
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
index 5239514c..9201741b 100644
--- a/config/crd/kustomization.yaml
+++ b/config/crd/kustomization.yaml
@@ -5,14 +5,11 @@ resources:
 - bases/apps.nvidia.com_nimservices.yaml
 - bases/apps.nvidia.com_nimcaches.yaml
 - bases/apps.nvidia.com_nimpipelines.yaml
-<<<<<<< HEAD
 - bases/apps.nvidia.com_nemocustomizers.yaml
-=======
 - bases/apps.nvidia.com_nemoguardrails.yaml
 - bases/apps.nvidia.com_nemoevaluators.yaml
 - bases/apps.nvidia.com_nemodatastores.yaml
 - bases/apps.nvidia.com_nemoentitystores.yaml
->>>>>>> 4cb6b28 (Fix project scaffolding for all microservices)
 # +kubebuilder:scaffold:crdkustomizeresource
 
 patches:
@@ -26,14 +23,11 @@ patches:
 #- path: patches/cainjection_in_nimworkflows.yaml
 #- path: patches/cainjection_in_nimcaches.yaml
 #- path: patches/cainjection_in_nimpipelines.yaml
-<<<<<<< HEAD
 #- path: patches/cainjection_in_nemocustomizers.yaml
-=======
 #- path: patches/cainjection_in_nemoguardrails.yaml
 #- path: patches/cainjection_in_nemoevaluators.yaml
 #- path: patches/cainjection_in_nemodatastores.yaml
 #- path: patches/cainjection_in_nemoentitystores.yaml
->>>>>>> 4cb6b28 (Fix project scaffolding for all microservices)
 # +kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # [WEBHOOK] To enable webhook, uncomment the following section
diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
index a035d8f2..f9796b52 100644
--- a/config/samples/kustomization.yaml
+++ b/config/samples/kustomization.yaml
@@ -3,12 +3,9 @@ resources:
 - apps_v1alpha1_nimservice.yaml
 - apps_v1alpha1_nimcache.yaml
 - apps_v1alpha1_nimpipeline.yaml
-<<<<<<< HEAD
 - apps_v1alpha1_nemocustomizer.yaml
-=======
 - apps_v1alpha1_nemoguardrails.yaml
 - apps_v1alpha1_nemoevaluator.yaml
 - apps_v1alpha1_nemodatastore.yaml
 - apps_v1alpha1_nemoentitystore.yaml
->>>>>>> 4cb6b28 (Fix project scaffolding for all microservices)
 # +kubebuilder:scaffold:manifestskustomizesamples