added local.py to .gitignore
Fixed conflicts