try to make a confiict 1