mnerge fix 2