merge with eldafani