Merged our combat changes together

Sorry about causing the conflict, I just wanted a head start but it
should be working in a happy medium now