fixed typescript merge errors