fix combine merge file issue