Basic d&d between lists
Merge conflicts