Remove minor conflict.