adaugare assets
resolve merge conflict