Sorting on the up - down votes
Fixing merge conflict