one more merge fix ... i forgot