update index and resolution mechanic pages
updated merge for resolution and rules index