rebuild with gps sorting
merge conflict