activities
conflicts
modified new activity login
working on new activity form
merging...