Fixed missing user_ids
Merge conflict resolution