Merge branch 'feature/t-4' # Conflicts: # html/styles/global/_global.scss # wp-content/themes/linde/functions.php