Edited Fight Method
Merged