3.16: handle attachment upload conflicts