updated profile and trips page
conflict resolution