Conflict has been added
different change
Resolved
Merge branch 'master' of https://github.com/vineetrastogi/phase-0-gps-1