Fix confrict