Fix previous merge.
1 file changed