adding index page changes for team2
removing conflicts