Fixed merge conflict.

Maybe.