Add planet yaml
Add effects column to events
Merge conflict