add picture & content
add bio
fix comflict