Fixed weird merge glitches from before