fix cookie store
remove duplicate story in show
fix merge