Fixed merge conflicts with updated assets.