add GPS model to the project
resolve conflict