edit nojima's article
commit for testing
update article
add image
correct remote conflict