primitive drag and drop
merge fix stuff...
merge resolution