Fixed one more merge failure