Remove conflict markers from RELEASE_NOTES.md

Signed-off-by: Leandro Lucarella <[email protected]>

Author: llucax

RELEASE_NOTES.md

@@ -112,8 +112,5 @@ To upgrade without regenerating the project, you can follow these steps:
 
 ### Cookiecutter template
 
-<<<<<<< HEAD
 - Fix the `test-installation` CI job when dependencies in `pyproject.toml` contain git URLs.
-=======
 - Fix cross-arch testing for respositories with submodules.
->>>>>>> ed6cc5f (Fetch submodules when doing cross-arch tests)