fix conflict names