finished auth friends
fixed routing merge
fixed routing merge
fixed routing merge