Attempt with toggle
Merge branch 'master' of git@github.com:Maestro1337/ssha.git
More for toggle
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Model/Skills/Warrior/SkillShieldStance.java
	src/Model/StatusEffects/StatusEffectShieldstance.java
More to toggle
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/View/MainView.java