modifiedd events
resolve events coflicts
removed conflicts