finish 1
change story
fix conlfict