fixed leftover conflic error that I accidently made