using png files for now
fixed merge conflict