Add conflicting actions resolver + discovery url selector