fix conflict

Signed-off-by: Takayuki Murooka <[email protected]>

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,55 @@
-**Note**: Confirm the [contribution guidelines](https://autowarefoundation.github.io/autoware-documentation/main/contributing/) before submitting a pull request.
+## PR Type
 
-Click the `Preview` tab and select a PR template:
+<!-- Select one and remove others. If an appropriate one is not listed, please write by yourself. -->
 
-- [Standard change](?expand=1&template=standard-change.md)
-- [Small change](?expand=1&template=small-change.md)
+- New Feature
+- Improvement
+- Bug Fix
 
-**Do NOT send a PR with this description.**
+## Related Links
+
+<!-- Please write related links to GitHub/Jira/Slack/etc. -->
+
+## Description
+
+<!-- Describe what this PR changes. -->
+
+## Review Procedure
+
+<!-- Explain how to review this PR. -->
+
+## Remarks
+
+<!-- Write remarks as you like if you need them. -->
+
+## Pre-Review Checklist for the PR Author
+
+**PR Author should check the checkboxes below when creating the PR.**
+
+- [ ] Code follows [coding guidelines][coding-guidelines]
+- [ ] Assign PR to reviewer
+
+## Checklist for the PR Reviewer
+
+**Reviewers should check the checkboxes below before approval.**
+
+- [ ] Commits are properly organized and messages are according to the guideline
+- [ ] Code follows [coding guidelines][coding-guidelines]
+- [ ] (Optional) Unit tests have been written for new behavior
+- [ ] PR title describes the changes
+
+## Post-Review Checklist for the PR Author
+
+**PR Author should check the checkboxes below before merging.**
+
+- [ ] All open points are addressed and tracked via issues or tickets
+- [ ] Write [release notes][release-notes]
+
+## CI Checks
+
+- **Build and test for PR**: Required to pass before the merge.
+- **Check spelling**: NOT required to pass before the merge. It is up to the reviewer(s). See [here][spell-check-dict] if you want to add some words to the spell check dictionary.
+
+[coding-guidelines]: https://tier4.atlassian.net/wiki/spaces/AIP/pages/1194394777/T4
+[release-notes]: https://tier4.atlassian.net/wiki/spaces/AIP/pages/563774416
+[spell-check-dict]: https://github.com/tier4/autoware-spell-check-dict#how-to-contribute

.github/sync-files.yaml

@@ -1,17 +1,7 @@
 - repository: autowarefoundation/autoware
   files:
-    - source: CODE_OF_CONDUCT.md
-    - source: CONTRIBUTING.md
-    - source: DISCLAIMER.md
-    - source: LICENSE
-    - source: .github/ISSUE_TEMPLATE/bug.yaml
-    - source: .github/ISSUE_TEMPLATE/config.yml
-    - source: .github/ISSUE_TEMPLATE/task.yaml
-    - source: .github/PULL_REQUEST_TEMPLATE.md
-    - source: .github/PULL_REQUEST_TEMPLATE/small-change.md
-    - source: .github/PULL_REQUEST_TEMPLATE/standard-change.md
     - source: .github/dependabot.yaml
-    - source: .github/stale.yml
+    - source: .github/workflows/backport.yaml
     - source: .github/workflows/github-release.yaml
     - source: .github/workflows/pre-commit.yaml
     - source: .github/workflows/pre-commit-optional.yaml
@@ -31,3 +21,8 @@
     - source: .github/workflows/build-and-test.yaml
     - source: .github/workflows/build-and-test-differential.yaml
     - source: .github/workflows/cancel-previous-workflows.yaml
+
+- repository: autowarefoundation/autoware_launch
+  files:
+    - source: .github/update-sync-param-files.py
+    - source: .github/workflows/update-sync-param-files.yaml

.github/sync-launch-files.yaml

@@ -0,0 +1,13 @@
+- repository: autowarefoundation/autoware_launch
+  files:
+    - source: autoware_launch/launch/autoware.launch.xml
+    - source: autoware_launch/launch/e2e_simulator.launch.xml
+    - source: autoware_launch/launch/logging_simulator.launch.xml
+    - source: autoware_launch/launch/planning_simulator.launch.xml
+    - source: autoware_launch/launch/pointcloud_container.launch.py
+    - source: autoware_launch/rviz/autoware.rviz
+    - source: autoware_launch/rviz/image/autoware.png
+    - source: autoware_launch/CMakeLists.txt
+    - source: autoware_launch/README.md
+    - source: autoware_launch/autoware_launch.drawio.svg
+    - source: autoware_launch/package.xml