fix tests
fix conflict