resolve conflict (must be a better way!)
add todo
cleanups
rebuild archives with unbroken js launcher