working on tests
fix merge conflict