receiving_damage added
fix conflicts