Meta: corrected typo in git_conventions.md

git_conventions.md

@@ -41,6 +41,8 @@ not part of the project itself but provides information to programmers on how
 to write the program.
 8. Others: if it doesn't fit in with the any of the above. <b>Avoid this subject
 header as much as possible.</b>
+9. Manual Merge: if you merged two branches manually. List down what branches you
+merged.
 
 ### Other Guidelines
 1. One commit message can have multiple subjects. For example,