changes support
resolving conflicts
Merge branch 'views_activity'