Fix confilct