remove the merge error in lock file
make basic trip api work
add basic tests for testing without trinidad
Merge branch 'feature/trip_query' into develop