test for conflict
resolve confict