fixes numtix
bug fixes
fixes merge conf