fixing bad merge
adding assets