Introduce error A and B
Introduce error C | fix error A
Introduce error D | fix error B
Merge branch 'delta_merge_aux' into delta_merge