International Association of Athletics Federations president Lamine Diack today confirmed there will be a resolution to the gender row surrounding Caster Semenya by the end of June.