Finish Trip show page
Update Merge Conflict