Use correct name
Use correct assets path
Merge branch 'refs/heads/staging'