add freeStart
fix conflict