Bug fixes

Two small bug fixes:
Events are not merged when you're the owner
Resetting event styles when they're changed to no longer be part of an event set