fixing conglict