Fixed patch conflict.