after merge patch2