Fix merge conflict
Fix merge conflict
Make SellerViewCJActivity able to list attachments