Fix merge II