implemented drag and drop
fixed conflict