Fix conflict name bug