added drag&drop
merge conflict
fixed conflict