Resolve conflicts link should anchor to the diff file

When clicking resolve conflicts on an MR with a large description, you have to scroll a long way to get to the conflicts resolution UI.

The link should link to /:namespace/:project/merge_requests/:id/conflicts#conflicts.