Fixed merge and mcgui point calc correction