Fixes a rebase thing