working on the wizard
resolove confict
fixed conflict