fix the test
fix the conflicts