File drag and drop
Canvas test
Resolve the conflict