dev11 && =
master&&&
conflict is ok
add the blog