changed token in userservice
solve conflict by keeping theirs