user disruptions
resolve conflicts...