fixed package merge'