rebuild after merge fixed undefined errors