discovered url bug
fixed merge conflict