added photos
merged
fixed error