Rebase after history update

Signed-off-by: Eric Lobdell <eric@ericlobdell.io>