Fixed merge glitch in start