-n 
resolved conflict
Merge branch 'gh-pages' of https://github.com/lamkeewei/rent-a-car

* 'gh-pages' of https://github.com/lamkeewei/rent-a-car:
  -n resolved conflict
Resolved additional conflict