adding activities works
merge conflicts
merge resolved