updating ui
adding new images
merging conflicts