instructions and images
conflict merged