>>>>>> Custom]]> Upgrade encountered ${merge.conflicts} merge conflicts. Please resolve all merge conflicts then run 'sencha app refresh'. generate package --framework=ext --type=theme --extend=${args.extend} --name=${args.name} Upgrading to Ext JS 5.x