fixed gps
resolve conflict