modify story
fix conflict