get activity
resolve conflicts