added conflict blog and cheat sheet in progress