Fix oops with merge