solved some conflicts in datasets