fixed a merge conflict
Merge branch 'MikeHoffert-feature-attack-boost' into develop