Fixed an upcoming merge conflict