Addded step 2
Added step 2 and removed a conflict