A few minor frontend changes to complete the refactoring from MWPS to the more generic autoMergeStrategy.
Attach a file by drag & drop or click to upload
