Rebase to master, finger cross