Fix merge 3.