Added a fucking sword
Fixed merge conflict