[bug fix] a few problems with conflict resolution during drag & drop
[bug fix] a few problems with conflict resolution during drag & drop
suewonjp/civilizer,suewonjp/civilizer,suewonjp/civilizer,suewonjp/civilizer