fixed package conflict