fix noboot, nogit conflicts
v0.0.3