edited fighton.cpp
resolved conflict