Added drag and drop functionality
Fixed merge conflict