Resolve conflict on trip show page