Describir: Merged conflict dataset