fix conflict error