add tests
fix merge conflicts