viewing and editting entries and trips
merging