changed settings
fixed conflict
merge conflict fix with urls.pyc file