Final merge

If you could, it'd be super if your merged one last time so I have the final repo on my account.

Thanks!