Messed up rebase fix