Fixed  Attachments disappear on merge

Top