blog assets
fixing merge conflict