replace cheatsheet w/previous version
update conflict blog