add json authenticate
add auth token
fix conflict