trips update,notification
conflict solved in user