fixed startup rewrite glitch
fix conflicts