Fix merge error 2