add story line view
merge changes