fix conflict name