Updates to content for receptions
Merge conflict resolution