Another missed merge