Update stale links in the Confilct Resolution/Index page
Merge pull request #1420 from basho/mapb/update-links-in-confilct-resolution

Update stale links in the Confilct Resolution/Index page