i change it again
i solve the merge conflict
I create a conflict