merge zen-typing and doc