edit status and delete events
edit status and delete events
conflicts and gitignore