tried to pull data from repo, got an error (can't merge manage.py), deleted everything locally, tried pulling (got nothing), deleted locally and pushed.. starting over.