Fix rebase after offline merge