Fix conflicts in data files