step 1
step 1 merge errors more