fixing confrict