gps stuff
merge conflict