Merge "update gps.conf"