always fix rebase config