fixed failed merge in Character