more assets styled
resolved conflicts