Fix merging mistake.
1 file changed