fixed package name bug
merged conflict