Re-fixed the name of the merge input field. Hopefully correct now
Only admin users can access the merge feature.
Comments now come along with the merge
Merge branch 'merge_comments'