fix Conflicts