fixed a merge glitch