Resume and mergecheck.
Merged things; hopefully didn't break anything this time.