Fix accidental conflicts