fixes to event delete and conflit resolution