pics show up in gallery
fixed merge conflict