Edit auth
fix conflits