merge with eldardamari