yet another merge fix