minor changes
conflict resolved