add drag/drop handling
resolve conflict