added some comments
conflict fix