3.12: handle attachment upload conflicts