Schema change
check if broadcast.user is not nil before displaying
Merge conflicts