geo location, search, flash alerts
fix merge conflicts