Update merge conflicts
wip
wip
wip
wip
wip
wip
wip
wip
wip
Audio.js broken