resolved case conflict