Fixed an overlooked conflict that was checked in