fix confrict