I already rebased but maybe I badly merged, thanks