fights + raise health
fix conflicts