diff for eventing and for merge have been separated
started to create the complex diff (which understands move)