I think I did rebasing wrong