Fix merge error on function redefinition