test for conflict
test for con
fix conflict