Changed a merge error, it should look for the user_id and not the username
Merge pull request #177 from projectcs13/Sp7.Sc1.fix_merge_error_ranking

Changed a merge error, it should look for the user_id and not the username