Fixed merge issues in MINX.h header