trip booking
conflict resolved