resolve merge conflict

Author: bcliang

CHANGELOG.md

@@ -9,7 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 - [#40](https://github.com/bcliang/gamry-parser/pull/40) Change: GamryParser to_timestamp param #40
-- [#41](https://github.com/bcliang/gamry-parser/pull/40) Use tox as test runner
+- [#41](https://github.com/bcliang/gamry-parser/pull/41) Use tox as test runner
 
 ### Added
 - [#42](https://github.com/bcliang/gamry-parser/pull/42) Update read_header function to support EFM140 data Files