merge new changes from the original meshkit