fix unmodified merge