Trying to rebase after a long time