test for conflict
解决conflict