updated default images
conflict resolved