resolve conflict
created a new index page