solved other conflicts