eledia resolving conflicts from 24 cherrypick