Functionnal drag and drop
Resolving conflicts