adding comment about the receipt data structure
fixing conflicts