super-merge

Merge everything