Conflict resolution

Solve events before sync when its possible.
Cases: Create + Move(rename) = Create with the new name
Create + Delete = Do nothing
Any other + delete = Do only the delete