Fixing merge glitch