Jun
I think its better to get a working version of BCMS-UI-Wizard on contribs rather than hold it back because of a problem with the merge.
Let me know (off-list) what changes are required to UI-Wizard to bring it back into line - or if its some feature I've added. If necessary I can then either rework the problem or move the relevent part out of BCMS into UI-Wizard to retain the feature.
- Steve