added conflict blog