fix confricts