add testing digest authentication
fix conflicts