add recommendation on PR title. fix a merge error

.github/pull_request_template.md

@@ -1,18 +1,25 @@
 <!--
+Please give the pull request a short but descriptive title.
+Use [conventional commits](https://www.conventionalcommits.org/) to separate and summarize commits logically.
+
 Use this template as a guide. Omit sections that don't apply. You may link to information rather than copy it.
-More details about the template are at https://github.com/edx/open-edx-proposals/pull/180 (link will be updated when that document merges)
+More details about the template are at https://github.com/edx/open-edx-proposals/pull/180
+(link will be updated when that document merges)
 -->
 
 ## Description
 
 Describe what this pull request changes, and why. Include implications for people using this change.
-Design decisions and their rationales should be be documented in the repo (docstring / ADR), per [OEP-19](https://open-edx-proposals.readthedocs.io/en/latest/oep-0019-bp-developer-documentation.html), and can be linked here.
+Design decisions and their rationales should be documented in the repo (docstring / ADR), per
+[OEP-19](https://open-edx-proposals.readthedocs.io/en/latest/oep-0019-bp-developer-documentation.html), and can be
+linked here.
 
 Useful information to include:
 - Which edX user roles will this change impact? Common user roles are "Learner", "Course Author",
 "Developer", and "Operator".
 - Include screenshots for changes to the UI (ideally, both "before" and "after" screenshots, if applicable).
-- Provide links to the description of corresponding configuration changes. Remember to correctly annotate these changes.
+- Provide links to the description of corresponding configuration changes. Remember to correctly annotate these
+changes.
 
 ## Supporting information