Fixed patch merge error