Create override_uri_spec attribute
Fix  merge conflict