gui done of index page
conflict done