add photo
add photo and fix merge