Resolving a conflict.

E: Derp, didn't compile.
Merge branch 'master' of https://github.com/scrdest/UristMcStation
Merge conflict, please be solved.