fix conflict
change code struct step 2