Fixed startup merge glitches