added images and updated header
fixed merge conflict in header