Changed settings to local
Got rid of old migration
Fixed merge conflict