location services implimented
merge