fixed most urls method
fixed merge conflict