Remove missed merge