trips and reviews
merge conflict solved