Resolve conflicts

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

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