updated assets and timer
conlicted assets