revise the first blog
merge confilct