fixes : ps

package-lock.json

@@ -215,8 +215,6 @@
         "@types/localforage": "0.0.30",
         "localforage": "~1.4.2",
         "localforage-cordovasqlitedriver": "~1.5.0"
-<<<<<<< HEAD
-=======
       }
     },
     "@netbasal/content-loader": {
@@ -232,7 +230,6 @@
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
           "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
         }
->>>>>>> 7d6b9204d0b22d85f2a9af7c6ff15479f39e0fe6
       }
     },
     "@types/chart.js": {
@@ -2735,13 +2732,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2758,8 +2753,7 @@
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
@@ -2888,7 +2882,6 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }

www/build/main.css

@@ -29893,7 +29893,6 @@ page-pd-question-rental-info .mat-card-content {
 
 page-pd-question-rental-info .scroll-content {
   background-color: #eee;
-<<<<<<< HEAD
 }
 
 page-pd-question-rental-info .mat-form-field-label {
@@ -29906,6 +29905,4 @@ page-pd-question-rental-info mat-select {
 
 page-pd-question-rental-info input {
   height: 30px;
-=======
->>>>>>> 7d6b9204d0b22d85f2a9af7c6ff15479f39e0fe6
 }