fix assets conflicts #293

Closed nandofw closed 1 year ago