Fix merge 2