updated index page conflicts