Fix patch conflict.