update to bring latitude and longitude back to app.py, just need to save in db
fixed conflicts