step 1
step 2
merged