Fixing one more conflict.