edited the add activity functionality
resolve conflict