add create activity functionality
resolve conflict
resolve conflict