added images and resolve cherry pick conflict