Merge resolution

Let me know if anything's busted, it still pushes events properly