fixed other conflicts