Chore/resolve main conflicts

src/components/NewUpdateModal/NewUpdateModal.module.scss

@@ -9,7 +9,7 @@
 }
 
 .content {
-  text-align: center;
+  text-align: left;
   padding: 8px 30px 0 30px;
 }
 
@@ -19,3 +19,20 @@
   top: 21%;
   cursor: pointer;
 }
+
+.btnWrapper {
+  text-align: center;
+
+  .closeBtn {
+    border-radius: 0;
+    background-color: #000;
+    color: #fff;
+    margin-top: 32px;
+    border: 1px solid #000 !important;
+
+    &:hover {
+      border: 1px solid #000 !important;
+      color: #fff !important;
+    }
+  }
+}

src/components/NewUpdateModal/NewUpdateModal.tsx

@@ -50,7 +50,13 @@ const NewUpdateModal: FC<NewUpdateModalProps> = ({ data, onClose }) => {
         >
           {data.description}
         </ReactMarkdown>
-        <Button label={closeText} onClick={onClose} type={'orange'} />
+        <div className={styles.btnWrapper}>
+          <Button
+            label={closeText}
+            onClick={onClose}
+            className={styles['closeBtn']}
+          />
+        </div>
       </div>
     </Modal>
   );