Changes around merge:

* Have the frontend show "Merge this record into X" instead of
    "Merge X into this record"

  * Show the merge dropdown from the edit views (required adding a
    toolbar to the subject edit view too)