fix merge conflict
add new feature illustrations