resolve conflicts. default to univ