activity view
resolve conflict