conflict 2
conf res