fixed pointer & reference type after rebase