few changes
conflict res1