added a comment fo better understanding in index page
resolved conflicts