gfgfg
fix
edit blog blade
conflicts