Made sure the lives would display
IE: Fixed merge errors again