River refactoring
Fixed conflict for addthis