repackaging for merge