working with index page
handling merge conflicts with index