Small assets task fixes
Fix conflicts