removed ds store
add image folder
resolved conflict