Drop conflicts, try to make cinelerra-hv co-installable with cinelerra-cv.