hmmmm, sw.js still seemed to have a merge conflict in it - fixing to just leave qgustavors code