bfs test
fix conflicts