edit list
resolve conflict