fixed package conflicts