If you developed your application features in separate branches, use the Merge Branches wizard to merge the branches before you package the application. The wizard shows any merge conflicts so that you can correct them before you merge the branches.

For more information about using the Merge Branches wizard, see Branch development.