In your AdminStudio Start page, Tools menu, choose ConflictSolver (Application Manager).
Open Catalog menu and choose Merge. You should be able to follow the rest of the steps pretty easily.
Disclaimer: I am using AdminStudio 6, but I think it's the same.....