Fix merge glitch.
1 file changed