added some code
conflict resolved