minor changes'
conflict res