drag and drop done
merge fixed