Fixed conflicts with new assets