Shadaerss

There was a merge conflict in users show, fixed now.