fix package name
fix conflict