fixed conflicts

views/taxis.html concerning taxi id