changed requirements.txt back to normal
this thing
handled merge conflict
added locations to map