add tests and bump version
Fix merge conflict