create a conflict
resolve conflict