Fixed creation of invalid activities bug
Fix merge conflicts