Refactored the item uid
Resolve conflicts
Rolled back the previous migration, and make the river_notifications test pass like a warm knife thru hot butter on a summer evening.
Take care not to include db dumps
Fix a subtle scoping bug which.