no overrides only one conflict