add events
resolve conflicts