update requirements
fix conflict