Added sword and shield actions
Merge
Resolving conflicts