add test
add conflict in test
add conflict master
rules conflict