Remove the temporary hack for amerge and replace it with a generic solution.
Attach a file by drag & drop or click to upload