CEDAW to discuss women in conflict and post-conflict situations