Fixed a forgotten merge conflict