add tests
fix merge conflict