I found a solution, I rebased my branch not from develop but from origin/develop: "git rebase origin/develop" then I fixed conflicts and I "git push --force" to my new branch.