fix requirement
fix conflict