Resolved merge conflicts and updated deployment file

deployment.yaml

@@ -14,13 +14,13 @@ spec:
     spec:
       containers:
         - name: afp-promotions-container
-          image: nexus.mynisum.com/afp-promotions:6
+          image: nexus.mynisum.com/afp-promotions:7
           imagePullPolicy: Always
           ports:
             - containerPort: 8082
           env:
             - name: PORT
-              value: "8080"
+              value: "8082"
             - name: MONGOCONNECTION
               valueFrom:
                 secretKeyRef:
@@ -37,6 +37,6 @@ spec:
   type: LoadBalancer
   ports:
     - port: 8082
-      targetPort: 8080
+      targetPort: 8082
   selector:
     app: afp-promotions
\ No newline at end of file

src/main/resources/application.properties

-
-server.port=8080
+server.port=8082
 spring.data.mongodb.uri=${MONGOCONNECTION}
-spring.data.mongodb.database=products-promotions-DB
\ No newline at end of file