Also, remove a stray line (apparently fallout from conflict resolution).
Attach a file by drag & drop or click to upload
