2man want to merge

fisher and yue