drag and drop to category to add association
merge conflicts