authToken ok
fix conflict