added pics
added images and fixed conflict