Fix bungled merge