Fix forgotten conflict.