Check for conflict clashes

[znicholls]

Pull request

Please confirm that this pull request has done the following:

• [x] Tests added
• [x] Documentation added (where applicable) (N/A)
• [x] Example added (either to an existing notebook or as a new notebook, where applicable) (N/A)
• [x] Description in CHANGELOG.rst added

Adding to CHANGELOG.rst

Please add a single line in the changelog notes similar to one of the following:

- (`#XX <http://link-to-pr.com>`_) Added feature which does something
- (`#XX <http://link-to-pr.com>`_) Fixed bug identified in (`#XX <http://link-to-issue.com>`_)

[codecov[bot]]

Codecov Report

Merging #321 (218f949) into master (35f0040) will increase coverage by 0.02%. The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master     #321      +/-   ##
==========================================
+ Coverage   93.31%   93.34%   +0.02%     
==========================================
  Files          18       18              
  Lines        2497     2508      +11     
  Branches      488      492       +4     
==========================================
+ Hits         2330     2341      +11     
  Misses        105      105              
  Partials       62       62              

Impacted Files	Coverage Δ
pymagicc/core.py	88.08% <100.00%> (+0.27%)	:arrow_up:

---

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 35f0040...218f949. Read the comment docs.