Revert "Resolve conflicts"

This reverts commit 0948c30cb887392824853f4799a93a62c2061f6a.

apps/app/src/components/Common/PagePathNavTitle/PagePathNavTitle.module.scss

@@ -2,4 +2,8 @@
 
 .grw-page-path-nav-title :global {
   min-height: 75px;
+<<<<<<< Updated upstream
+=======
+  // padding-right: 70px;
+>>>>>>> Stashed changes
 }