.
fix merge conflict in storyviewfragment