fix merge conflicts

Author: fdiblen

template/README.dev.md.jinja

@@ -135,7 +135,6 @@ This section describes how to make a release in 3 parts:
 
 {% if AddChangeLog -%}1. Update the <CHANGELOG.md> (don't forget to update links at bottom of page).{%- endif %}
 {% if AddCitation -%}1. Verify that the information in [`CITATION.cff`](CITATION.cff) is correct.{%- endif %}
-1. Verify that the information in [`CITATION.cff`](CITATION.cff) is correct.
 1. Make sure the [version has been updated](#versioning).
 1. Run the unit tests with `pytest -v`