Fix merge 1