Fixed Trip Resolution
Merge branch 'master' of https://github.com/hardik-panchal/brilliant