Left over merge fixed