Fix conflict name