Update dependencies with slacker
Fix merge conflict

The setup.py could not be merged automatically by pull