trips/tags not working
merging