changes testdata and booking a trip
many changes + merge conflict