Fixed a committed merge conflict