Remove accidental artifact of rebase merge