Fixed Merging Glitch