Fixed merge conflict for tripdurationconversion.js