Fixed a merge conflict.