bk
fix conflict code