fix typescript ver
fix conflict