fix dependencies, publish again
fix conflict