REST: position GPS
solve merge conflict
solve merger conflict 2