fix conflict code