resolve conflicts for tabbed carousel

.github/pull_request_template.md

@@ -1,5 +1,5 @@
 Fix #<gh-issue-id>
 
 Test URLs:
-- Before: https://main--vg-macktrucks-com-rd--netcentric.hlx.page/
-- After: https://<branch>--vg-macktrucks-com-rd--netcentric.hlx.page/
+- Before: https://main--vg-macktrucks-com--hlxsites.hlx.page/
+- After: https://<branch>--vg-macktrucks-com--hlxsites.hlx.page/

.github/release.yml

@@ -0,0 +1,22 @@
+# .github/release.yml
+
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+  categories:
+    - title: Functional requirements
+      labels:
+        - FR
+    - title: Non-functional requirements
+      labels:
+        - NFR
+    - title: Bugfixes
+      labels:
+        - Bugfix
+    - title: Known issues
+      labels:
+        - wontfix
+    - title: Other changes
+      labels:
+        - "*"

README.md

@@ -2,8 +2,8 @@
 Franklin site redesign for macktrucks.com
 
 ## Environments
-- Preview: https://main--vg-macktrucks-com-rd--netcentric.hlx.page/
-- Live: https://main--vg-macktrucks-com-rd--netcentric.hlx.live/
+- Preview: https://main--vg-macktrucks-com--hlxsites.hlx.page/
+- Live: https://main--vg-macktrucks-com--hlxsites.hlx.live/
 
 ## Installation