selections
resolve conflict