fix bug de tests
fix conflicts