dynamic plotting of activities
merge conflicts